diff options
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/test_limits.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_api.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_migrations.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_notifications.py | 2 | ||||
| -rw-r--r-- | nova/tests/virt/libvirt/test_fakelibvirt.py | 6 | ||||
| -rw-r--r-- | nova/tests/virt/libvirt/test_libvirt.py | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py index e51601e31..79bb97d2a 100644 --- a/nova/tests/api/openstack/compute/test_limits.py +++ b/nova/tests/api/openstack/compute/test_limits.py @@ -462,7 +462,7 @@ class ParseLimitsTest(BaseLimitTestSuite): '(PUT, /foo*, /foo.*, 10, hour);' '(POST, /bar*, /bar.*, 5, second);' '(Say, /derp*, /derp.*, 1, day)') - except ValueError, e: + except ValueError as e: assert False, str(e) # Make sure the number of returned limits are correct diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index 949f54512..3c3ac6c6c 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -309,7 +309,7 @@ class ApiEc2TestCase(test.TestCase): try: self.ec2.create_key_pair('test') - except boto_exc.EC2ResponseError, e: + except boto_exc.EC2ResponseError as e: if e.code == 'InvalidKeyPair.Duplicate': pass else: diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index 00cfdbf6c..9baf9eb6a 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -219,7 +219,7 @@ class BaseMigrationTestCase(test.TestCase): for key, value in defaults.items(): self.test_databases[key] = value self.snake_walk = cp.getboolean('walk_style', 'snake_walk') - except ConfigParser.ParsingError, e: + except ConfigParser.ParsingError as e: self.fail("Failed to read test_migrations.conf config " "file. Got error: %s" % e) else: diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index 71b85b375..988ce983d 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -99,7 +99,7 @@ class NotificationsTestCase(test.TestCase): try: # Get a real exception with a call stack. raise test.TestingException("junk") - except test.TestingException, e: + except test.TestingException as e: exception = e notifications.send_api_fault("http://example.com/foo", 500, exception) diff --git a/nova/tests/virt/libvirt/test_fakelibvirt.py b/nova/tests/virt/libvirt/test_fakelibvirt.py index 52183ab5f..8fa2ffc63 100644 --- a/nova/tests/virt/libvirt/test_fakelibvirt.py +++ b/nova/tests/virt/libvirt/test_fakelibvirt.py @@ -136,7 +136,7 @@ class FakeLibvirtTests(test.TestCase): conn = self.get_openAuth_curry_func()('qemu:///system') try: getattr(conn, xmlfunc_name)("this is not valid </xml>", *args) - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: self.assertEqual(e.get_error_code(), libvirt.VIR_ERR_XML_DETAIL) self.assertEqual(e.get_error_domain(), libvirt.VIR_FROM_DOMAIN) return @@ -242,7 +242,7 @@ class FakeLibvirtTests(test.TestCase): dom_id = conn.listDomainsID()[0] try: conn.lookupByID(dom_id + 1) - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: self.assertEqual(e.get_error_code(), libvirt.VIR_ERR_NO_DOMAIN) self.assertEqual(e.get_error_domain(), libvirt.VIR_FROM_QEMU) return @@ -315,7 +315,7 @@ class FakeLibvirtTests(test.TestCase): nwfilter.undefine() try: conn.nwfilterLookupByName('nova-instance-instance-789320334') - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: self.assertEqual(e.get_error_code(), libvirt.VIR_ERR_NO_NWFILTER) self.assertEqual(e.get_error_domain(), libvirt.VIR_FROM_NWFILTER) return diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index 22defe13f..4fb5c7245 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -2154,7 +2154,7 @@ class LibvirtConnTestCase(test.TestCase): conn.ensure_filtering_rules_for_instance(instance_ref, network_info, time_module=fake_timer) - except exception.NovaException, e: + except exception.NovaException as e: msg = ('The firewall filter for %s does not exist' % instance_ref['name']) c1 = (0 <= str(e).find(msg)) |