Skip to content

Commit 2debde3

Browse files
author
Tang Chen
committed
Trivial: Reorder classes in identity v3 in alphabetical order
Change-Id: Iaf2e336c2415416ec69f6b974743c26509bba561
1 parent e3e2f38 commit 2debde3

6 files changed

Lines changed: 217 additions & 217 deletions

File tree

‎openstackclient/tests/identity/v3/test_consumer.py‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -136,45 +136,6 @@ def test_consumer_list(self):
136136
self.assertEqual(datalist, tuple(data))
137137

138138

139-
class TestConsumerShow(TestOAuth1):
140-
141-
def setUp(self):
142-
super(TestConsumerShow, self).setUp()
143-
144-
consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
145-
del consumer_no_secret['secret']
146-
self.consumers_mock.get.return_value = fakes.FakeResource(
147-
None,
148-
consumer_no_secret,
149-
loaded=True,
150-
)
151-
152-
# Get the command object to test
153-
self.cmd = consumer.ShowConsumer(self.app, None)
154-
155-
def test_consumer_show(self):
156-
arglist = [
157-
identity_fakes.consumer_id,
158-
]
159-
verifylist = [
160-
('consumer', identity_fakes.consumer_id),
161-
]
162-
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
163-
columns, data = self.cmd.take_action(parsed_args)
164-
165-
self.consumers_mock.get.assert_called_with(
166-
identity_fakes.consumer_id,
167-
)
168-
169-
collist = ('description', 'id')
170-
self.assertEqual(collist, columns)
171-
datalist = (
172-
identity_fakes.consumer_description,
173-
identity_fakes.consumer_id,
174-
)
175-
self.assertEqual(datalist, data)
176-
177-
178139
class TestConsumerSet(TestOAuth1):
179140

180141
def setUp(self):
@@ -217,3 +178,42 @@ def test_consumer_update(self):
217178
**kwargs
218179
)
219180
self.assertIsNone(result)
181+
182+
183+
class TestConsumerShow(TestOAuth1):
184+
185+
def setUp(self):
186+
super(TestConsumerShow, self).setUp()
187+
188+
consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
189+
del consumer_no_secret['secret']
190+
self.consumers_mock.get.return_value = fakes.FakeResource(
191+
None,
192+
consumer_no_secret,
193+
loaded=True,
194+
)
195+
196+
# Get the command object to test
197+
self.cmd = consumer.ShowConsumer(self.app, None)
198+
199+
def test_consumer_show(self):
200+
arglist = [
201+
identity_fakes.consumer_id,
202+
]
203+
verifylist = [
204+
('consumer', identity_fakes.consumer_id),
205+
]
206+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
207+
columns, data = self.cmd.take_action(parsed_args)
208+
209+
self.consumers_mock.get.assert_called_with(
210+
identity_fakes.consumer_id,
211+
)
212+
213+
collist = ('description', 'id')
214+
self.assertEqual(collist, columns)
215+
datalist = (
216+
identity_fakes.consumer_description,
217+
identity_fakes.consumer_id,
218+
)
219+
self.assertEqual(datalist, data)

‎openstackclient/tests/identity/v3/test_identity_provider.py‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -310,46 +310,6 @@ def test_identity_provider_list_no_options(self):
310310
self.assertEqual(datalist, tuple(data))
311311

312312

313-
class TestIdentityProviderShow(TestIdentityProvider):
314-
315-
def setUp(self):
316-
super(TestIdentityProviderShow, self).setUp()
317-
318-
ret = fakes.FakeResource(
319-
None,
320-
copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
321-
loaded=True,
322-
)
323-
self.identity_providers_mock.get.return_value = ret
324-
# Get the command object to test
325-
self.cmd = identity_provider.ShowIdentityProvider(self.app, None)
326-
327-
def test_identity_provider_show(self):
328-
arglist = [
329-
identity_fakes.idp_id,
330-
]
331-
verifylist = [
332-
('identity_provider', identity_fakes.idp_id),
333-
]
334-
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
335-
336-
columns, data = self.cmd.take_action(parsed_args)
337-
338-
self.identity_providers_mock.get.assert_called_with(
339-
identity_fakes.idp_id,
340-
)
341-
342-
collist = ('description', 'enabled', 'id', 'remote_ids')
343-
self.assertEqual(collist, columns)
344-
datalist = (
345-
identity_fakes.idp_description,
346-
True,
347-
identity_fakes.idp_id,
348-
identity_fakes.formatted_idp_remote_ids
349-
)
350-
self.assertEqual(datalist, data)
351-
352-
353313
class TestIdentityProviderSet(TestIdentityProvider):
354314

355315
columns = (
@@ -627,3 +587,43 @@ def prepare(self):
627587
# neither --enable nor --disable was specified
628588
self.assertIsNone(columns)
629589
self.assertIsNone(data)
590+
591+
592+
class TestIdentityProviderShow(TestIdentityProvider):
593+
594+
def setUp(self):
595+
super(TestIdentityProviderShow, self).setUp()
596+
597+
ret = fakes.FakeResource(
598+
None,
599+
copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
600+
loaded=True,
601+
)
602+
self.identity_providers_mock.get.return_value = ret
603+
# Get the command object to test
604+
self.cmd = identity_provider.ShowIdentityProvider(self.app, None)
605+
606+
def test_identity_provider_show(self):
607+
arglist = [
608+
identity_fakes.idp_id,
609+
]
610+
verifylist = [
611+
('identity_provider', identity_fakes.idp_id),
612+
]
613+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
614+
615+
columns, data = self.cmd.take_action(parsed_args)
616+
617+
self.identity_providers_mock.get.assert_called_with(
618+
identity_fakes.idp_id,
619+
)
620+
621+
collist = ('description', 'enabled', 'id', 'remote_ids')
622+
self.assertEqual(collist, columns)
623+
datalist = (
624+
identity_fakes.idp_description,
625+
True,
626+
identity_fakes.idp_id,
627+
identity_fakes.formatted_idp_remote_ids
628+
)
629+
self.assertEqual(datalist, data)

‎openstackclient/tests/identity/v3/test_mappings.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -145,41 +145,6 @@ def test_mapping_list(self):
145145
self.assertEqual(datalist, data)
146146

147147

148-
class TestMappingShow(TestMapping):
149-
150-
def setUp(self):
151-
super(TestMappingShow, self).setUp()
152-
153-
self.mapping_mock.get.return_value = fakes.FakeResource(
154-
None,
155-
copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
156-
loaded=True
157-
)
158-
159-
self.cmd = mapping.ShowMapping(self.app, None)
160-
161-
def test_mapping_show(self):
162-
arglist = [
163-
identity_fakes.mapping_id
164-
]
165-
verifylist = [
166-
('mapping', identity_fakes.mapping_id)
167-
]
168-
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
169-
170-
columns, data = self.cmd.take_action(parsed_args)
171-
172-
self.mapping_mock.get.assert_called_with(
173-
identity_fakes.mapping_id)
174-
175-
collist = ('id', 'rules')
176-
self.assertEqual(collist, columns)
177-
178-
datalist = (identity_fakes.mapping_id,
179-
identity_fakes.MAPPING_RULES)
180-
self.assertEqual(datalist, data)
181-
182-
183148
class TestMappingSet(TestMapping):
184149

185150
def setUp(self):
@@ -242,3 +207,38 @@ def test_set_rules_wrong_file_path(self):
242207
exceptions.CommandError,
243208
self.cmd.take_action,
244209
parsed_args)
210+
211+
212+
class TestMappingShow(TestMapping):
213+
214+
def setUp(self):
215+
super(TestMappingShow, self).setUp()
216+
217+
self.mapping_mock.get.return_value = fakes.FakeResource(
218+
None,
219+
copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
220+
loaded=True
221+
)
222+
223+
self.cmd = mapping.ShowMapping(self.app, None)
224+
225+
def test_mapping_show(self):
226+
arglist = [
227+
identity_fakes.mapping_id
228+
]
229+
verifylist = [
230+
('mapping', identity_fakes.mapping_id)
231+
]
232+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
233+
234+
columns, data = self.cmd.take_action(parsed_args)
235+
236+
self.mapping_mock.get.assert_called_with(
237+
identity_fakes.mapping_id)
238+
239+
collist = ('id', 'rules')
240+
self.assertEqual(collist, columns)
241+
242+
datalist = (identity_fakes.mapping_id,
243+
identity_fakes.MAPPING_RULES)
244+
self.assertEqual(datalist, data)

0 commit comments

Comments
 (0)