Merge "Test take_action() instead of run() in unit tests"

Author: Jenkins

openstackclient/tests/identity/v2_0/test_project.py

@@ -307,12 +307,12 @@ def test_project_delete_no_options(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         self.projects_mock.delete.assert_called_with(
             identity_fakes.project_id,
         )
+        self.assertIsNone(result)
 
 
 class TestProjectList(TestProject):
@@ -406,8 +406,9 @@ def test_project_set_no_options(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
+
+        self.assertIsNone(result)
 
     def test_project_set_name(self):
         arglist = [
@@ -422,8 +423,7 @@ def test_project_set_name(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -435,6 +435,7 @@ def test_project_set_name(self):
             identity_fakes.project_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_project_set_description(self):
         arglist = [
@@ -449,8 +450,7 @@ def test_project_set_description(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -462,6 +462,7 @@ def test_project_set_description(self):
             identity_fakes.project_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_project_set_enable(self):
         arglist = [
@@ -475,8 +476,7 @@ def test_project_set_enable(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -488,6 +488,7 @@ def test_project_set_enable(self):
             identity_fakes.project_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_project_set_disable(self):
         arglist = [
@@ -501,8 +502,7 @@ def test_project_set_disable(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -514,6 +514,7 @@ def test_project_set_disable(self):
             identity_fakes.project_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_project_set_property(self):
         arglist = [
@@ -527,8 +528,7 @@ def test_project_set_property(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -542,6 +542,7 @@ def test_project_set_property(self):
             identity_fakes.project_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
 
 class TestProjectShow(TestProject):
@@ -615,7 +616,7 @@ def test_project_unset_key(self):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.cmd.run(parsed_args)
+        self.cmd.take_action(parsed_args)
         # Set expected values
         kwargs = {
             'description': identity_fakes.project_description,

openstackclient/tests/identity/v2_0/test_user.py

@@ -558,8 +558,9 @@ def test_user_set_no_options(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
+
+        self.assertIsNone(result)
 
     def test_user_set_name(self):
         arglist = [

openstackclient/tests/identity/v3/test_consumer.py

@@ -87,12 +87,12 @@ def test_delete_consumer(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         self.consumers_mock.delete.assert_called_with(
             identity_fakes.consumer_id,
         )
+        self.assertIsNone(result)
 
 
 class TestConsumerList(TestOAuth1):
@@ -208,11 +208,12 @@ def test_consumer_update(self):
             ('consumer', identity_fakes.consumer_id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+
+        result = self.cmd.take_action(parsed_args)
 
         kwargs = {'description': new_description}
         self.consumers_mock.update.assert_called_with(
             identity_fakes.consumer_id,
             **kwargs
         )
+        self.assertIsNone(result)

openstackclient/tests/identity/v3/test_domain.py

@@ -194,12 +194,12 @@ def test_domain_delete(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         self.domains_mock.delete.assert_called_with(
             identity_fakes.domain_id,
         )
+        self.assertIsNone(result)
 
 
 class TestDomainList(TestDomain):
@@ -269,10 +269,10 @@ def test_domain_set_no_options(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         self.assertNotCalled(self.domains_mock.update)
+        self.assertIsNone(result)
 
     def test_domain_set_name(self):
         arglist = [
@@ -285,8 +285,7 @@ def test_domain_set_name(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -296,6 +295,7 @@ def test_domain_set_name(self):
             identity_fakes.domain_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_domain_set_description(self):
         arglist = [
@@ -308,8 +308,7 @@ def test_domain_set_description(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -319,6 +318,7 @@ def test_domain_set_description(self):
             identity_fakes.domain_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_domain_set_enable(self):
         arglist = [
@@ -331,8 +331,7 @@ def test_domain_set_enable(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -342,6 +341,7 @@ def test_domain_set_enable(self):
             identity_fakes.domain_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
     def test_domain_set_disable(self):
         arglist = [
@@ -354,8 +354,7 @@ def test_domain_set_disable(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
+        result = self.cmd.take_action(parsed_args)
 
         # Set expected values
         kwargs = {
@@ -365,6 +364,7 @@ def test_domain_set_disable(self):
             identity_fakes.domain_id,
             **kwargs
         )
+        self.assertIsNone(result)
 
 
 class TestDomainShow(TestDomain):