Merge "Trivial: Reorder classes in identity v3 in alphabetical order"

Author: Jenkins

openstackclient/tests/identity/v3/test_consumer.py

@@ -136,45 +136,6 @@ def test_consumer_list(self):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestConsumerShow(TestOAuth1):
-
-    def setUp(self):
-        super(TestConsumerShow, self).setUp()
-
-        consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
-        del consumer_no_secret['secret']
-        self.consumers_mock.get.return_value = fakes.FakeResource(
-            None,
-            consumer_no_secret,
-            loaded=True,
-        )
-
-        # Get the command object to test
-        self.cmd = consumer.ShowConsumer(self.app, None)
-
-    def test_consumer_show(self):
-        arglist = [
-            identity_fakes.consumer_id,
-        ]
-        verifylist = [
-            ('consumer', identity_fakes.consumer_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.consumers_mock.get.assert_called_with(
-            identity_fakes.consumer_id,
-        )
-
-        collist = ('description', 'id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.consumer_description,
-            identity_fakes.consumer_id,
-        )
-        self.assertEqual(datalist, data)
-
-
 class TestConsumerSet(TestOAuth1):
 
     def setUp(self):
@@ -217,3 +178,42 @@ def test_consumer_update(self):
             **kwargs
         )
         self.assertIsNone(result)
+
+
+class TestConsumerShow(TestOAuth1):
+
+    def setUp(self):
+        super(TestConsumerShow, self).setUp()
+
+        consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
+        del consumer_no_secret['secret']
+        self.consumers_mock.get.return_value = fakes.FakeResource(
+            None,
+            consumer_no_secret,
+            loaded=True,
+        )
+
+        # Get the command object to test
+        self.cmd = consumer.ShowConsumer(self.app, None)
+
+    def test_consumer_show(self):
+        arglist = [
+            identity_fakes.consumer_id,
+        ]
+        verifylist = [
+            ('consumer', identity_fakes.consumer_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.consumers_mock.get.assert_called_with(
+            identity_fakes.consumer_id,
+        )
+
+        collist = ('description', 'id')
+        self.assertEqual(collist, columns)
+        datalist = (
+            identity_fakes.consumer_description,
+            identity_fakes.consumer_id,
+        )
+        self.assertEqual(datalist, data)

openstackclient/tests/identity/v3/test_identity_provider.py

@@ -310,46 +310,6 @@ def test_identity_provider_list_no_options(self):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestIdentityProviderShow(TestIdentityProvider):
-
-    def setUp(self):
-        super(TestIdentityProviderShow, self).setUp()
-
-        ret = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
-            loaded=True,
-        )
-        self.identity_providers_mock.get.return_value = ret
-        # Get the command object to test
-        self.cmd = identity_provider.ShowIdentityProvider(self.app, None)
-
-    def test_identity_provider_show(self):
-        arglist = [
-            identity_fakes.idp_id,
-        ]
-        verifylist = [
-            ('identity_provider', identity_fakes.idp_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.identity_providers_mock.get.assert_called_with(
-            identity_fakes.idp_id,
-        )
-
-        collist = ('description', 'enabled', 'id', 'remote_ids')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.idp_description,
-            True,
-            identity_fakes.idp_id,
-            identity_fakes.formatted_idp_remote_ids
-        )
-        self.assertEqual(datalist, data)
-
-
 class TestIdentityProviderSet(TestIdentityProvider):
 
     columns = (
@@ -627,3 +587,43 @@ def prepare(self):
         # neither --enable nor --disable was specified
         self.assertIsNone(columns)
         self.assertIsNone(data)
+
+
+class TestIdentityProviderShow(TestIdentityProvider):
+
+    def setUp(self):
+        super(TestIdentityProviderShow, self).setUp()
+
+        ret = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
+            loaded=True,
+        )
+        self.identity_providers_mock.get.return_value = ret
+        # Get the command object to test
+        self.cmd = identity_provider.ShowIdentityProvider(self.app, None)
+
+    def test_identity_provider_show(self):
+        arglist = [
+            identity_fakes.idp_id,
+        ]
+        verifylist = [
+            ('identity_provider', identity_fakes.idp_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.identity_providers_mock.get.assert_called_with(
+            identity_fakes.idp_id,
+        )
+
+        collist = ('description', 'enabled', 'id', 'remote_ids')
+        self.assertEqual(collist, columns)
+        datalist = (
+            identity_fakes.idp_description,
+            True,
+            identity_fakes.idp_id,
+            identity_fakes.formatted_idp_remote_ids
+        )
+        self.assertEqual(datalist, data)

openstackclient/tests/identity/v3/test_mappings.py

@@ -145,41 +145,6 @@ def test_mapping_list(self):
         self.assertEqual(datalist, data)
 
 
-class TestMappingShow(TestMapping):
-
-    def setUp(self):
-        super(TestMappingShow, self).setUp()
-
-        self.mapping_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
-            loaded=True
-        )
-
-        self.cmd = mapping.ShowMapping(self.app, None)
-
-    def test_mapping_show(self):
-        arglist = [
-            identity_fakes.mapping_id
-        ]
-        verifylist = [
-            ('mapping', identity_fakes.mapping_id)
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.mapping_mock.get.assert_called_with(
-            identity_fakes.mapping_id)
-
-        collist = ('id', 'rules')
-        self.assertEqual(collist, columns)
-
-        datalist = (identity_fakes.mapping_id,
-                    identity_fakes.MAPPING_RULES)
-        self.assertEqual(datalist, data)
-
-
 class TestMappingSet(TestMapping):
 
     def setUp(self):
@@ -242,3 +207,38 @@ def test_set_rules_wrong_file_path(self):
             exceptions.CommandError,
             self.cmd.take_action,
             parsed_args)
+
+
+class TestMappingShow(TestMapping):
+
+    def setUp(self):
+        super(TestMappingShow, self).setUp()
+
+        self.mapping_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
+            loaded=True
+        )
+
+        self.cmd = mapping.ShowMapping(self.app, None)
+
+    def test_mapping_show(self):
+        arglist = [
+            identity_fakes.mapping_id
+        ]
+        verifylist = [
+            ('mapping', identity_fakes.mapping_id)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.mapping_mock.get.assert_called_with(
+            identity_fakes.mapping_id)
+
+        collist = ('id', 'rules')
+        self.assertEqual(collist, columns)
+
+        datalist = (identity_fakes.mapping_id,
+                    identity_fakes.MAPPING_RULES)
+        self.assertEqual(datalist, data)