On Tue, Dec 19, 2017 at 02:34:22PM -0300, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > tests/qemu-iotests/093 | 2 +- > tests/qemu-iotests/096 | 4 ++-- > tests/qemu-iotests/136 | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Daniel P. Berrange <berra...@redhat.com> > > diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093 > index 5c36a5fb4d..28b1d021ca 100755 > --- a/tests/qemu-iotests/093 > +++ b/tests/qemu-iotests/093 > @@ -237,7 +237,7 @@ class ThrottleTestGroupNames(iotests.QMPTestCase): > if name: > self.assertEqual(info["group"], name) > else: > - self.assertFalse(info.has_key('group')) > + self.assertFalse('group' in info) > return > > raise Exception("No group information found for '%s'" % device) > diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096 > index aeeb3753cf..a69439602d 100644 > --- a/tests/qemu-iotests/096 > +++ b/tests/qemu-iotests/096 > @@ -53,9 +53,9 @@ class TestLiveSnapshot(iotests.QMPTestCase): > self.assertEqual(r['iops'], self.iops) > self.assertEqual(r['iops_size'], self.iops_size) > else: > - self.assertFalse(r.has_key('group')) > + self.assertFalse('group' in r) > self.assertEqual(r['iops'], 0) > - self.assertFalse(r.has_key('iops_size')) > + self.assertFalse('iops_size' in r) > > def testSnapshot(self): > self.checkConfig('base') > diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136 > index 88b97ea7c6..a154d8ef9d 100644 > --- a/tests/qemu-iotests/136 > +++ b/tests/qemu-iotests/136 > @@ -203,7 +203,7 @@ sector = "%d" > if (self.accounted_ops(read = True, write = True, flush = True) != > 0): > self.assertLess(0, stats['idle_time_ns']) > else: > - self.assertFalse(stats.has_key('idle_time_ns')) > + self.assertFalse('idle_time_ns' in stats) > > # This test does not alter these, so they must be all 0 > self.assertEqual(0, stats['rd_merged']) > -- > 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 :|