Commit a93a42bd authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

iotests.py: Let assert_qmp() accept an array 



Sometimes we cannot tell which error message qemu will emit, and we do
not care.  With this change, we can then just pass an array of all
possible messages to assert_qmp() and it will choose the right one.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 481e0eee

tests/qemu-iotests/iotests.py

+16 −2
Original line number Diff line number Diff line
@@ -596,9 +596,23 @@ class QMPTestCase(unittest.TestCase): 
        self.fail('path "%s" has value "%s"' % (path, str(result)))



    def assert_qmp(self, d, path, value):

        '''Assert that the value for a specific path in a QMP dict matches'''

        '''Assert that the value for a specific path in a QMP dict

           matches.  When given a list of values, assert that any of

           them matches.'''



        result = self.dictpath(d, path)

        self.assertEqual(result, value, 'values not equal "%s" and "%s"' % (str(result), str(value)))



        # [] makes no sense as a list of valid values, so treat it as

        # an actual single value.

        if isinstance(value, list) and value != []:

            for v in value:

                if result == v:

                    return

            self.fail('no match for "%s" in %s' % (str(result), str(value)))

        else:

            self.assertEqual(result, value,

                             'values not equal "%s" and "%s"'

                                 % (str(result), str(value)))



    def assert_no_active_block_jobs(self):

        result = self.vm.qmp('query-block-jobs')