Merge "replace assertNotEquals with assertNotEqual"

nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py

@@ -109,7 +109,7 @@ def test_create_security_group_default_rule_with_no_cidr(self):
         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 @@ def test_create_security_group_default_rule_with_blank_cidr(self):
         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')
 

nova/tests/api/openstack/compute/contrib/test_security_groups.py

@@ -746,7 +746,7 @@ def test_create_by_cidr(self):
         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 @@ def test_create_by_group_id(self):
         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 @@ def test_create_by_same_group_id(self):
         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 @@ def test_create_with_no_cidr_group(self):
         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 @@ def test_create_with_same_group_parent_id_and_group_id(self):
         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 @@ def test_create_rule_cidr_allow_all(self):
         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 @@ def test_create_rule_cidr_ipv6_allow_all(self):
         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 @@ def test_create_rule_cidr_allow_some(self):
         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'],

nova/tests/test_service.py

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

nova/tests/test_wsgi.py

@@ -179,7 +179,7 @@ def test_app(env, start_response):
         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,

nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py

@@ -80,7 +80,7 @@ def test_get_datastore_ref_and_name_with_list(self):
         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

smoketests/test_sysadmin.py

@@ -303,9 +303,9 @@ def test_005_volume_is_correct_size(self):
         conn.close()
         # NOTE(vish): 1G bytes / 512 bytes per block
         expected_size = 1024 * 1024 * 1024 / 512
-        self.assertEquals('%s' % (expected_size,), out,
-                          'Volume is not the right size: %s %s. Expected: %s' %
-                          (out, stderr.read(), expected_size))
+        self.assertEqual('%s' % (expected_size,), out,
+                         'Volume is not the right size: %s %s. Expected: %s' %
+                         (out, stderr.read(), expected_size))
 
     def test_006_me_can_umount_volume(self):
         ip = self.data['instance'].private_ip_address