On Tue, Dec 19, 2017 at 02:34:24PM -0300, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> tests/qemu-iotests/041 | 6 +++---
> tests/qemu-iotests/118 | 4 ++--
> tests/qemu-iotests/iotests.py | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
>
> diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
> index a860a31e9a..fa0f20af0e 100755
> --- a/tests/qemu-iotests/041
> +++ b/tests/qemu-iotests/041
> @@ -457,7 +457,7 @@ new_state = "1"
> self.assert_qmp(result, 'return', {})
>
> event = self.vm.get_qmp_event(wait=True)
> - self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')
> + self.assertEqual(event['event'], 'BLOCK_JOB_ERROR')
> self.assert_qmp(event, 'data/device', 'drive0')
> self.assert_qmp(event, 'data/operation', 'read')
> result = self.vm.qmp('query-block-jobs')
> @@ -478,7 +478,7 @@ new_state = "1"
> self.assert_qmp(result, 'return', {})
>
> event = self.vm.get_qmp_event(wait=True)
> - self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')
> + self.assertEqual(event['event'], 'BLOCK_JOB_ERROR')
> self.assert_qmp(event, 'data/device', 'drive0')
> self.assert_qmp(event, 'data/operation', 'read')
> result = self.vm.qmp('query-block-jobs')
> @@ -609,7 +609,7 @@ new_state = "1"
> self.assert_qmp(result, 'return', {})
>
> event = self.vm.get_qmp_event(wait=True)
> - self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')
> + self.assertEqual(event['event'], 'BLOCK_JOB_ERROR')
> self.assert_qmp(event, 'data/device', 'drive0')
> self.assert_qmp(event, 'data/operation', 'write')
> result = self.vm.qmp('query-block-jobs')
> diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
> index 3cf21218f0..8158b4bd25 100755
> --- a/tests/qemu-iotests/118
> +++ b/tests/qemu-iotests/118
> @@ -295,7 +295,7 @@ class GeneralChangeTestsBaseClass(ChangeBaseClass):
> result = self.vm.qmp('blockdev-close-tray', device='drive0')
> # Should be a no-op
> self.assert_qmp(result, 'return', {})
> - self.assertEquals(self.vm.get_qmp_events(wait=False), [])
> + self.assertEqual(self.vm.get_qmp_events(wait=False), [])
>
> def test_remove_on_closed(self):
> if not self.has_real_tray:
> @@ -476,7 +476,7 @@ class TestChangeReadOnly(ChangeBaseClass):
> read_only_mode='retain')
> self.assert_qmp(result, 'error/class', 'GenericError')
>
> - self.assertEquals(self.vm.get_qmp_events(wait=False), [])
> + self.assertEqual(self.vm.get_qmp_events(wait=False), [])
>
> result = self.vm.qmp('query-block')
> self.assert_qmp(result, 'return[0]/inserted/ro', False)
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 85c9d2c211..4c515d2e6c 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -385,7 +385,7 @@ class QMPTestCase(unittest.TestCase):
> def wait_ready_and_cancel(self, drive='drive0'):
> self.wait_ready(drive=drive)
> event = self.cancel_and_wait(drive=drive)
> - self.assertEquals(event['event'], 'BLOCK_JOB_COMPLETED')
> + self.assertEqual(event['event'], 'BLOCK_JOB_COMPLETED')
> self.assert_qmp(event, 'data/type', 'mirror')
> self.assert_qmp(event, 'data/offset', event['data']['len'])
>
> --
> 2.15.1
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|