Merge "Replace assertEquals with assertEqual"

This commit is contained in:
Jenkins 2016-12-16 09:19:45 +00:00 committed by Gerrit Code Review
commit 37d1855c0f
4 changed files with 4 additions and 4 deletions

View File

@ -191,7 +191,7 @@ class JsonExporterTest(InstStructureTest, OswlTest, DbTest):
self.check_response_ok(resp)
result = json.loads(resp.data)
self.assertEquals(filtered_num, result['paging_params']['total'])
self.assertEqual(filtered_num, result['paging_params']['total'])
for struct in result['objs']:
self.assertTrue(struct['is_filtered'])

View File

@ -128,7 +128,7 @@ class NodesToCsvExportTest(InstStructureTest, DbTest):
self.assertIsNotNone(flatten_node[pos_mn_uid])
self.assertIsNotNone(flatten_node[pos_cluster_id])
self.assertIsNotNone(flatten_node[pos_status])
self.assertEquals(len(csv_paths), len(flatten_node))
self.assertEqual(len(csv_paths), len(flatten_node))
def test_export_nodes(self):
installations_num = 100

View File

@ -59,7 +59,7 @@ class PluginsToCsvExportTest(InstStructureTest, DbTest):
for flatten_plugin in flatten_plugins:
self.assertIsNotNone(flatten_plugin[pos_mn_uid])
self.assertIsNotNone(flatten_plugin[pos_cluster_id])
self.assertEquals(len(csv_paths), len(flatten_plugin))
self.assertEqual(len(csv_paths), len(flatten_plugin))
def test_export_plugins(self):
installations_num = 100

View File

@ -84,7 +84,7 @@ class StatsToCsvExportTest(InstStructureTest, DbTest):
structure_paths, cluster_paths, inst_structures, [])
self.assertIsInstance(flatten_clusters, types.GeneratorType)
for flatten_cluster in flatten_clusters:
self.assertEquals(len(csv_paths), len(flatten_cluster))
self.assertEqual(len(csv_paths), len(flatten_cluster))
def test_flatten_data_as_csv(self):
installations_num = 100