From 3ac29e7f86229fed06256c38e8aa1f208185322f Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Mon, 20 Jan 2020 18:46:40 +0200 Subject: [PATCH] s/assertItemsEqual/assertCountEqual/g assertItemsEqual was renamed to assertCountEqual in Python 3, and the testsuite is failing now - rename it. See also https://six.readthedocs.io/#six.assertCountEqual This unbreaks the testsuite. Change-Id: Ia04b22a61dab28a986216ae2f4f49106ee843fa0 --- trove_dashboard/content/database_configurations/tests.py | 2 +- trove_dashboard/content/databases/logs/tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trove_dashboard/content/database_configurations/tests.py b/trove_dashboard/content/database_configurations/tests.py index f8e1e9a9..1906fc36 100644 --- a/trove_dashboard/content/database_configurations/tests.py +++ b/trove_dashboard/content/database_configurations/tests.py @@ -526,7 +526,7 @@ class DatabaseConfigurationsTests(test.TestCase): self.mock_configuration_instances.assert_called_once_with( test.IsHttpRequest(), config.id) table_data = res.context['instances_table'].data - self.assertItemsEqual( + self.assertCountEqual( self.configuration_instances.list(), table_data) self.assertTemplateUsed( res, 'project/database_configurations/details.html') diff --git a/trove_dashboard/content/databases/logs/tests.py b/trove_dashboard/content/databases/logs/tests.py index 6bbe9923..48acbee6 100644 --- a/trove_dashboard/content/databases/logs/tests.py +++ b/trove_dashboard/content/databases/logs/tests.py @@ -53,7 +53,7 @@ class LogsTests(test.TestCase): self.mock_root_show.assert_called_once_with( test.IsHttpRequest(), database.id) table_data = res.context['logs_table'].data - self.assertItemsEqual(self.logs.list(), table_data) + self.assertCountEqual(self.logs.list(), table_data) self.assertTemplateUsed( res, 'horizon/common/_detail_table.html')