Merge "tests: Move assert helpers to utils.TestCommand"

Author: Zuul

openstackclient/tests/unit/network/v2/fwaas/test_rule.py

@@ -17,7 +17,6 @@
 import re
 from unittest import mock
 
-from cliff import columns as cliff_columns
 from openstack.network.v2 import firewall_rule
 from openstack.test import fakes as sdk_fakes
 from osc_lib import exceptions
@@ -79,26 +78,6 @@ def check_results(self, headers, data, exp_req=None, is_list=False):
             self.mocked.assert_called_once_with(**req_body)
         self.assertEqual(self.ordered_headers, headers)
 
-    # TODO(slaweq): remove this method once network_fakes.TestNetworkV2 will
-    # inherit from the osc_lib.test.base.TestCommand
-    def assertListItemEqual(self, expected, actual):
-        self.assertEqual(len(expected), len(actual))
-        for item_expected, item_actual in zip(expected, actual):
-            self.assertItemEqual(item_expected, item_actual)
-
-    # TODO(slaweq): remove this method once network_fakes.TestNetworkV2 will
-    # inherit from the osc_lib.test.base.TestCommand
-    def assertItemEqual(self, expected, actual):
-        self.assertEqual(len(expected), len(actual))
-        for col_expected, col_actual in zip(expected, actual):
-            if isinstance(col_expected, cliff_columns.FormattableColumn):
-                self.assertIsInstance(col_actual, col_expected.__class__)
-                self.assertEqual(
-                    col_expected.human_readable(), col_actual.human_readable()
-                )
-            else:
-                self.assertEqual(col_expected, col_actual)
-
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/utils.py

@@ -17,6 +17,7 @@
 import io
 import os
 
+from cliff import columns as cliff_columns
 import fixtures
 import testtools
 
@@ -69,6 +70,28 @@ def assertNotCalled(self, m, msg=None):
 class TestCommand(TestCase):
     """Test cliff command classes"""
 
+    # TODO(slaweq): Remove those methods in favour of the ones in
+    # osc_lib.test.base.TestCommand once osc-lib TestCommand
+    # provides all of the same functionality as this TestCommand
+    # like e.g. the monkey patching for sys.stderr and this one can be
+    # removed.
+
+    def assertListItemEqual(self, expected, actual):
+        self.assertEqual(len(expected), len(actual))
+        for item_expected, item_actual in zip(expected, actual):
+            self.assertItemEqual(item_expected, item_actual)
+
+    def assertItemEqual(self, expected, actual):
+        self.assertEqual(len(expected), len(actual))
+        for col_expected, col_actual in zip(expected, actual):
+            if isinstance(col_expected, cliff_columns.FormattableColumn):
+                self.assertIsInstance(col_actual, col_expected.__class__)
+                self.assertEqual(
+                    col_expected.human_readable(), col_actual.human_readable()
+                )
+            else:
+                self.assertEqual(col_expected, col_actual)
+
     def setUp(self):
         super().setUp()
         # Build up a fake app