openstack/deb-nova
Code Issues Proposed changes

Merge "replace assertNotEquals with assertNotEqual"

Browse Source
This commit is contained in:
Jenkins
2013-11-14 21:57:31 +00:00
committed by Gerrit Code Review
parent 05355144d1 bbe3b2c55a
commit e5ca5668b1
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py
View File

@@ -109,7 +109,7 @@ class TestSecurityGroupDefaultRules(test.TestCase):
res_dict = self.controller.create(req,
{'security_group_default_rule': sgr})
security_group_default_rule = res_dict['security_group_default_rule']
self.assertNotEquals(security_group_default_rule['id'], 0)
self.assertNotEqual(security_group_default_rule['id'], 0)
self.assertEqual(security_group_default_rule['ip_range']['cidr'],
'0.0.0.0/0')
@@ -145,7 +145,7 @@ class TestSecurityGroupDefaultRules(test.TestCase):
res_dict = self.controller.create(req,
{'security_group_default_rule': sgr})
security_group_default_rule = res_dict['security_group_default_rule']
self.assertNotEquals(security_group_default_rule['id'], 0)
self.assertNotEqual(security_group_default_rule['id'], 0)
self.assertEqual(security_group_default_rule['ip_range']['cidr'],
'0.0.0.0/0')

16
nova/tests/api/openstack/compute/contrib/test_security_groups.py
View File

@@ -746,7 +746,7 @@ class TestSecurityGroupRules(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules')
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.sg2['id'])
self.assertEqual(security_group_rule['ip_range']['cidr'],
@@ -760,7 +760,7 @@ class TestSecurityGroupRules(test.TestCase):
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.sg2['id'])
@@ -778,7 +778,7 @@ class TestSecurityGroupRules(test.TestCase):
res_dict = self.controller.create(req, {'security_group_rule': rule2})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.sg2['id'])
self.assertEqual(security_group_rule['from_port'], 81)
@@ -990,7 +990,7 @@ class TestSecurityGroupRules(test.TestCase):
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.parent_security_group['id'])
self.assertEqual(security_group_rule['ip_range']['cidr'],
@@ -1026,7 +1026,7 @@ class TestSecurityGroupRules(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules')
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.sg1['id'])
self.assertEqual(security_group_rule['group']['name'],
@@ -1160,7 +1160,7 @@ class TestSecurityGroupRules(test.TestCase):
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.parent_security_group['id'])
self.assertEqual(security_group_rule['ip_range']['cidr'],
@@ -1174,7 +1174,7 @@ class TestSecurityGroupRules(test.TestCase):
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.parent_security_group['id'])
self.assertEqual(security_group_rule['ip_range']['cidr'],
@@ -1188,7 +1188,7 @@ class TestSecurityGroupRules(test.TestCase):
res_dict = self.controller.create(req, {'security_group_rule': rule})
security_group_rule = res_dict['security_group_rule']
self.assertNotEquals(security_group_rule['id'], 0)
self.assertNotEqual(security_group_rule['id'], 0)
self.assertEqual(security_group_rule['parent_group_id'],
self.parent_security_group['id'])
self.assertEqual(security_group_rule['ip_range']['cidr'],

2
nova/tests/test_service.py
View File

@@ -242,5 +242,5 @@ class TestLauncher(test.TestCase):
def test_launch_app(self):
service.serve(self.service)
self.assertNotEquals(0, self.service.port)
self.assertNotEqual(0, self.service.port)
service._launcher.stop()

2
nova/tests/test_wsgi.py
View File

@@ -179,7 +179,7 @@ class TestWSGIServerWithSSL(test.NoDBTestCase):
fake_server = nova.wsgi.Server("fake", test_app,
host="127.0.0.1", port=0)
fake_server.start()
self.assertNotEquals(0, fake_server.port)
self.assertNotEqual(0, fake_server.port)
cli = eventlet.connect(("localhost", fake_ssl_server.port))
cli = eventlet.wrap_ssl(cli,

2
nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
View File

@@ -80,7 +80,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
fake_objects.add_object(fake.Datastore("openstack-ds2"))
result = vm_util.get_datastore_ref_and_name(
fake_session(fake_objects), None, None, datastore_valid_regex)
self.assertNotEquals("openstack-ds1", result[1])
self.assertNotEqual("openstack-ds1", result[1])
def test_get_datastore_ref_and_name_with_regex_error(self):
# Test with a regex that has no match