Skip to content

Commit eb15742

Browse files
author
Tang Chen
committed
Test take_action() instead of run() in unit tests
Some of the unit tests test run(), but not take_action(). For example, in openstackclient/tests/volume/v1/test_volume.py, there is: def test_volume_set_size_smaller(self): ...... result = self.cmd.run(parsed_args) self.assertEqual(0, result) ...... run() is defined in class Command in cliff. We don't need to test it in OSC unit tests. On the contrary, we should test take_action(), which is overwritten in each command classes in OSC. Change-Id: If07e89953d40ac530f08cbb1ec05f5805171364b Closes-bug: #1553468
1 parent fa3a343 commit eb15742

11 files changed

Lines changed: 107 additions & 101 deletions

File tree

‎openstackclient/tests/identity/v2_0/test_project.py‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ def test_project_delete_no_options(self):
307307
]
308308
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
309309

310-
result = self.cmd.run(parsed_args)
311-
self.assertEqual(0, result)
310+
result = self.cmd.take_action(parsed_args)
312311

313312
self.projects_mock.delete.assert_called_with(
314313
identity_fakes.project_id,
315314
)
315+
self.assertIsNone(result)
316316

317317

318318
class TestProjectList(TestProject):
@@ -406,8 +406,9 @@ def test_project_set_no_options(self):
406406
]
407407
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
408408

409-
result = self.cmd.run(parsed_args)
410-
self.assertEqual(0, result)
409+
result = self.cmd.take_action(parsed_args)
410+
411+
self.assertIsNone(result)
411412

412413
def test_project_set_name(self):
413414
arglist = [
@@ -422,8 +423,7 @@ def test_project_set_name(self):
422423
]
423424
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
424425

425-
result = self.cmd.run(parsed_args)
426-
self.assertEqual(0, result)
426+
result = self.cmd.take_action(parsed_args)
427427

428428
# Set expected values
429429
kwargs = {
@@ -435,6 +435,7 @@ def test_project_set_name(self):
435435
identity_fakes.project_id,
436436
**kwargs
437437
)
438+
self.assertIsNone(result)
438439

439440
def test_project_set_description(self):
440441
arglist = [
@@ -449,8 +450,7 @@ def test_project_set_description(self):
449450
]
450451
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
451452

452-
result = self.cmd.run(parsed_args)
453-
self.assertEqual(0, result)
453+
result = self.cmd.take_action(parsed_args)
454454

455455
# Set expected values
456456
kwargs = {
@@ -462,6 +462,7 @@ def test_project_set_description(self):
462462
identity_fakes.project_id,
463463
**kwargs
464464
)
465+
self.assertIsNone(result)
465466

466467
def test_project_set_enable(self):
467468
arglist = [
@@ -475,8 +476,7 @@ def test_project_set_enable(self):
475476
]
476477
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
477478

478-
result = self.cmd.run(parsed_args)
479-
self.assertEqual(0, result)
479+
result = self.cmd.take_action(parsed_args)
480480

481481
# Set expected values
482482
kwargs = {
@@ -488,6 +488,7 @@ def test_project_set_enable(self):
488488
identity_fakes.project_id,
489489
**kwargs
490490
)
491+
self.assertIsNone(result)
491492

492493
def test_project_set_disable(self):
493494
arglist = [
@@ -501,8 +502,7 @@ def test_project_set_disable(self):
501502
]
502503
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
503504

504-
result = self.cmd.run(parsed_args)
505-
self.assertEqual(0, result)
505+
result = self.cmd.take_action(parsed_args)
506506

507507
# Set expected values
508508
kwargs = {
@@ -514,6 +514,7 @@ def test_project_set_disable(self):
514514
identity_fakes.project_id,
515515
**kwargs
516516
)
517+
self.assertIsNone(result)
517518

518519
def test_project_set_property(self):
519520
arglist = [
@@ -527,8 +528,7 @@ def test_project_set_property(self):
527528
]
528529
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
529530

530-
result = self.cmd.run(parsed_args)
531-
self.assertEqual(0, result)
531+
result = self.cmd.take_action(parsed_args)
532532

533533
# Set expected values
534534
kwargs = {
@@ -542,6 +542,7 @@ def test_project_set_property(self):
542542
identity_fakes.project_id,
543543
**kwargs
544544
)
545+
self.assertIsNone(result)
545546

546547

547548
class TestProjectShow(TestProject):
@@ -615,7 +616,7 @@ def test_project_unset_key(self):
615616

616617
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
617618

618-
self.cmd.run(parsed_args)
619+
self.cmd.take_action(parsed_args)
619620
# Set expected values
620621
kwargs = {
621622
'description': identity_fakes.project_description,

‎openstackclient/tests/identity/v2_0/test_user.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,9 @@ def test_user_set_no_options(self):
558558
]
559559
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
560560

561-
result = self.cmd.run(parsed_args)
562-
self.assertEqual(0, result)
561+
result = self.cmd.take_action(parsed_args)
562+
563+
self.assertIsNone(result)
563564

564565
def test_user_set_name(self):
565566
arglist = [

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ def test_delete_consumer(self):
8787
]
8888
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
8989

90-
result = self.cmd.run(parsed_args)
91-
self.assertEqual(0, result)
90+
result = self.cmd.take_action(parsed_args)
9291

9392
self.consumers_mock.delete.assert_called_with(
9493
identity_fakes.consumer_id,
9594
)
95+
self.assertIsNone(result)
9696

9797

9898
class TestConsumerList(TestOAuth1):
@@ -208,11 +208,12 @@ def test_consumer_update(self):
208208
('consumer', identity_fakes.consumer_id),
209209
]
210210
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
211-
result = self.cmd.run(parsed_args)
212-
self.assertEqual(0, result)
211+
212+
result = self.cmd.take_action(parsed_args)
213213

214214
kwargs = {'description': new_description}
215215
self.consumers_mock.update.assert_called_with(
216216
identity_fakes.consumer_id,
217217
**kwargs
218218
)
219+
self.assertIsNone(result)

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ def test_domain_delete(self):
194194
]
195195
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
196196

197-
result = self.cmd.run(parsed_args)
198-
self.assertEqual(0, result)
197+
result = self.cmd.take_action(parsed_args)
199198

200199
self.domains_mock.delete.assert_called_with(
201200
identity_fakes.domain_id,
202201
)
202+
self.assertIsNone(result)
203203

204204

205205
class TestDomainList(TestDomain):
@@ -269,10 +269,10 @@ def test_domain_set_no_options(self):
269269
]
270270
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
271271

272-
result = self.cmd.run(parsed_args)
273-
self.assertEqual(0, result)
272+
result = self.cmd.take_action(parsed_args)
274273

275274
self.assertNotCalled(self.domains_mock.update)
275+
self.assertIsNone(result)
276276

277277
def test_domain_set_name(self):
278278
arglist = [
@@ -285,8 +285,7 @@ def test_domain_set_name(self):
285285
]
286286
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
287287

288-
result = self.cmd.run(parsed_args)
289-
self.assertEqual(0, result)
288+
result = self.cmd.take_action(parsed_args)
290289

291290
# Set expected values
292291
kwargs = {
@@ -296,6 +295,7 @@ def test_domain_set_name(self):
296295
identity_fakes.domain_id,
297296
**kwargs
298297
)
298+
self.assertIsNone(result)
299299

300300
def test_domain_set_description(self):
301301
arglist = [
@@ -308,8 +308,7 @@ def test_domain_set_description(self):
308308
]
309309
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
310310

311-
result = self.cmd.run(parsed_args)
312-
self.assertEqual(0, result)
311+
result = self.cmd.take_action(parsed_args)
313312

314313
# Set expected values
315314
kwargs = {
@@ -319,6 +318,7 @@ def test_domain_set_description(self):
319318
identity_fakes.domain_id,
320319
**kwargs
321320
)
321+
self.assertIsNone(result)
322322

323323
def test_domain_set_enable(self):
324324
arglist = [
@@ -331,8 +331,7 @@ def test_domain_set_enable(self):
331331
]
332332
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
333333

334-
result = self.cmd.run(parsed_args)
335-
self.assertEqual(0, result)
334+
result = self.cmd.take_action(parsed_args)
336335

337336
# Set expected values
338337
kwargs = {
@@ -342,6 +341,7 @@ def test_domain_set_enable(self):
342341
identity_fakes.domain_id,
343342
**kwargs
344343
)
344+
self.assertIsNone(result)
345345

346346
def test_domain_set_disable(self):
347347
arglist = [
@@ -354,8 +354,7 @@ def test_domain_set_disable(self):
354354
]
355355
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
356356

357-
result = self.cmd.run(parsed_args)
358-
self.assertEqual(0, result)
357+
result = self.cmd.take_action(parsed_args)
359358

360359
# Set expected values
361360
kwargs = {
@@ -365,6 +364,7 @@ def test_domain_set_disable(self):
365364
identity_fakes.domain_id,
366365
**kwargs
367366
)
367+
self.assertIsNone(result)
368368

369369

370370
class TestDomainShow(TestDomain):

0 commit comments

Comments
 (0)