diff --git a/nailgun/nailgun/extensions/network_manager/tests/test_network_manager.py b/nailgun/nailgun/extensions/network_manager/tests/test_network_manager.py index ee84f60d95..4ac9e73fd7 100644 --- a/nailgun/nailgun/extensions/network_manager/tests/test_network_manager.py +++ b/nailgun/nailgun/extensions/network_manager/tests/test_network_manager.py @@ -464,7 +464,7 @@ class TestNetworkManager(BaseIntegrationTest): admin_net1 = objects.NetworkGroup.get_admin_network_group(node=node0) admin_net2 = objects.NetworkGroup.get_admin_network_group(node=node1) - self.assertEqual(admin_net1.group_id, None) + self.assertIsNone(admin_net1.group_id) self.assertEqual(admin_net2.group_id, node_group.json_body['id']) def test_get_admin_network_group_with_admin_net(self): diff --git a/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py b/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py index f764dfefca..d31f35e976 100644 --- a/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py +++ b/nailgun/nailgun/extensions/network_manager/tests/test_node_nic_handlers_w_bonding.py @@ -320,7 +320,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): ) self.assertEqual(200, resp.status_code) - self.assertEqual(node.cluster, None) + self.assertIsNone(node.cluster) resp = self.env.node_nics_get(node.id) self.assertEqual(resp.status_code, 200) @@ -341,7 +341,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): ) self.assertEqual(resp.status_code, 200) - self.assertEqual(node.cluster, None) + self.assertIsNone(node.cluster) resp = self.env.node_nics_get(node.id) self.assertEqual(resp.status_code, 200) diff --git a/nailgun/nailgun/test/integration/test_cluster_handler.py b/nailgun/nailgun/test/integration/test_cluster_handler.py index b764cc650f..a302cde121 100644 --- a/nailgun/nailgun/test/integration/test_cluster_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_handler.py @@ -179,8 +179,8 @@ class TestHandlers(BaseIntegrationTest): self.assertEqual(self.db.query(Node).count(), 2) for node in self.db.query(Node): self.assertEqual(node.status, 'discover') - self.assertEqual(node.cluster_id, None) - self.assertEqual(node.group_id, None) + self.assertIsNone(node.cluster_id) + self.assertIsNone(node.group_id) self.assertEqual(node.roles, []) self.assertFalse(node.pending_deletion) self.assertFalse(node.pending_addition) @@ -201,7 +201,7 @@ class TestHandlers(BaseIntegrationTest): node = self.db.query(Node).first() self.assertEqual(node.status, 'discover') - self.assertEqual(node.cluster_id, None) + self.assertIsNone(node.cluster_id) def test_cluster_deletion_delete_networks(self): cluster = self.env.create_cluster(api=True) diff --git a/nailgun/nailgun/test/integration/test_node_collection_handlers.py b/nailgun/nailgun/test/integration/test_node_collection_handlers.py index 6a97c58b01..ca06dcc936 100644 --- a/nailgun/nailgun/test/integration/test_node_collection_handlers.py +++ b/nailgun/nailgun/test/integration/test_node_collection_handlers.py @@ -428,7 +428,7 @@ class TestHandlers(BaseIntegrationTest): expect_http=400, expected_error="No mac address specified" ) - self.assertEqual(node, None) + self.assertIsNone(node) def test_node_create_with_invalid_disk_model(self): meta = self.env.default_metadata() @@ -534,7 +534,7 @@ class TestHandlers(BaseIntegrationTest): self.assertEqual(1, len(resp.json_body)) self.assertEqual(node.id, resp.json_body[0]['id']) self.assertEqual(node.name, node_name) - self.assertEqual(node.cluster, None) + self.assertIsNone(node.cluster) self.assertEqual(node.pending_roles, []) def test_discovered_node_unified_name(self): diff --git a/nailgun/nailgun/test/integration/test_task_managers.py b/nailgun/nailgun/test/integration/test_task_managers.py index 71cddaca88..08ba3b65b9 100644 --- a/nailgun/nailgun/test/integration/test_task_managers.py +++ b/nailgun/nailgun/test/integration/test_task_managers.py @@ -1039,7 +1039,7 @@ class TestTaskManagers(BaseIntegrationTest): for node in q_nodes: self.assertEqual(node.status, 'discover') - self.assertEqual(node.cluster_id, None) + self.assertIsNone(node.cluster_id) @fake_tasks(recover_offline_nodes=False) def test_deletion_offline_node_when_cluster_has_only_one_node(self): diff --git a/nailgun/nailgun/test/unit/fuyaql_tests/test_fuyaql.py b/nailgun/nailgun/test/unit/fuyaql_tests/test_fuyaql.py index 167710ec38..627ce22cfd 100644 --- a/nailgun/nailgun/test/unit/fuyaql_tests/test_fuyaql.py +++ b/nailgun/nailgun/test/unit/fuyaql_tests/test_fuyaql.py @@ -163,7 +163,7 @@ class TestFuyaqlController(base.BaseUnitTest): self.assertRaises(self.controller.evaluate('changed($.roles)')) def test_get_task(self, obj_mock): - self.assertEqual(self.controller._get_task(None), None) + self.assertIsNone(self.controller._get_task(None)) obj_mock.Transaction.get_by_uid.return_value = None self.assertFalse(self.controller._get_task(1)) @@ -214,13 +214,13 @@ class TestFuyaqlController(base.BaseUnitTest): {'1': {'a': 2}}, self.controller._infos[self.controller.EXPECTED], ) - self.assertEqual(self.controller._node_id, None) + self.assertIsNone(self.controller._node_id) self.controller._node_id = 8 self.controller._set_info(self.controller.EXPECTED, None) self.assertEqual(self.controller._infos[self.controller.EXPECTED], self.new_context) - self.assertEqual(self.controller._node_id, None) + self.assertIsNone(self.controller._node_id) serialized.assert_called_once_with( self.controller._cluster, diff --git a/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py b/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py index e701c48c8d..cf0a40d285 100644 --- a/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py +++ b/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py @@ -299,7 +299,7 @@ class TestAttributesDowngrade(base.BaseAlembicMigrationTest): for editable in results: editable = jsonutils.loads(editable[0]) common = editable.setdefault('common', {}) - self.assertEqual(common.get('security_groups'), None) + self.assertIsNone(common.get('security_groups')) def test_release_attributes_downgrade(self): releases = self.meta.tables['releases'] @@ -308,7 +308,7 @@ class TestAttributesDowngrade(base.BaseAlembicMigrationTest): for attrs in results: attrs = jsonutils.loads(attrs[0]) common = attrs.setdefault('editable', {}).setdefault('common', {}) - self.assertEqual(common.get('security_groups'), None) + self.assertIsNone(common.get('security_groups')) class TestTags(base.BaseAlembicMigrationTest): diff --git a/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py b/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py index 0a1619a62d..1aecb1dd2c 100644 --- a/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py +++ b/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py @@ -624,7 +624,7 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): for attrs in results: attrs = jsonutils.loads(attrs[0]) common = attrs.setdefault('editable', {}).setdefault('common', {}) - self.assertEqual(common.get('security_groups'), None) + self.assertIsNone(common.get('security_groups')) def test_cluster_attributes_update(self): clusters_attributes = self.meta.tables['attributes'] @@ -654,7 +654,7 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): for editable in results: editable = jsonutils.loads(editable[0]) common = editable.setdefault('common', {}) - self.assertEqual(common.get('security_groups'), None) + self.assertIsNone(common.get('security_groups')) def test_upgrade_release_with_nic_attributes(self): releases_table = self.meta.tables['releases'] diff --git a/nailgun/nailgun/test/unit/test_migration_plugins_cluster_attrs_use_ids_mapping.py b/nailgun/nailgun/test/unit/test_migration_plugins_cluster_attrs_use_ids_mapping.py index b47d876552..429806d978 100644 --- a/nailgun/nailgun/test/unit/test_migration_plugins_cluster_attrs_use_ids_mapping.py +++ b/nailgun/nailgun/test/unit/test_migration_plugins_cluster_attrs_use_ids_mapping.py @@ -63,5 +63,5 @@ class TestMigrationPluginsClusterAttrs(BaseTestCase): connection = self.db.connection() upgrade_6_0_to_6_1_plugins_cluster_attrs_use_ids_mapping(connection) plugin_attr = self.cluster.attributes.editable['some_plugin_name'] - self.assertEqual(plugin_attr['metadata']['plugin_id'], None) + self.assertIsNone(plugin_attr['metadata']['plugin_id']) self.assertNotIn('plugin_version', plugin_attr['metadata']) diff --git a/nailgun/nailgun/test/unit/test_node_assignment_handler.py b/nailgun/nailgun/test/unit/test_node_assignment_handler.py index e944547147..9672873443 100644 --- a/nailgun/nailgun/test/unit/test_node_assignment_handler.py +++ b/nailgun/nailgun/test/unit/test_node_assignment_handler.py @@ -56,7 +56,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): ] resp = self._assign_roles(assignment_data) self.assertEqual(200, resp.status_code) - self.assertEqual(None, resp.json_body) + self.assertIsNone(resp.json_body) self.assertEqual(node.cluster, self.cluster) self.datadiff( node.pending_roles, @@ -82,8 +82,8 @@ class TestAssignmentHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - self.assertEqual(None, resp.json_body) - self.assertEqual(node.cluster, None) + self.assertIsNone(resp.json_body) + self.assertIsNone(node.cluster) self.assertEqual(node.pending_roles, []) self.assertEqual(node.pending_addition, False) diff --git a/nailgun/nailgun/test/unit/test_objects.py b/nailgun/nailgun/test/unit/test_objects.py index 3697cc97db..a7cddd1685 100644 --- a/nailgun/nailgun/test/unit/test_objects.py +++ b/nailgun/nailgun/test/unit/test_objects.py @@ -465,7 +465,7 @@ class TestNodeObject(BaseIntegrationTest): node2_db = self.env.create_node() objects.Node.remove_from_cluster(node_db) self.db().refresh(config) - self.assertEqual(node_db.cluster_id, None) + self.assertIsNone(node_db.cluster_id) self.assertEqual(node_db.roles, []) self.assertEqual(node_db.pending_roles, []) self.assertFalse(config.is_active)