diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-07 16:01:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-07 16:01:17 +0000 |
| commit | dcc27fd5d31124e3b25f17de9b91cfe833b4ff0c (patch) | |
| tree | 81e2f9242464cdb880e5a16cc4bcb970c84cbbf7 /openstackclient/tests/identity/v2_0 | |
| parent | fc24f37ae28e1b7f6b9587a8062a314d660a0136 (diff) | |
| parent | eb1574281b84e86ee4c4b65d900e1de82c24471e (diff) | |
| download | python-openstackclient-dcc27fd5d31124e3b25f17de9b91cfe833b4ff0c.tar.gz | |
Merge "Test take_action() instead of run() in unit tests"
Diffstat (limited to 'openstackclient/tests/identity/v2_0')
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_project.py | 31 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_user.py | 5 |
2 files changed, 19 insertions, 17 deletions
diff --git a/openstackclient/tests/identity/v2_0/test_project.py b/openstackclient/tests/identity/v2_0/test_project.py index 669c3eab..98570297 100644 --- a/openstackclient/tests/identity/v2_0/test_project.py +++ b/openstackclient/tests/identity/v2_0/test_project.py @@ -307,12 +307,12 @@ class TestProjectDelete(TestProject): ] 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 @@ class TestProjectSet(TestProject): ] 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 @@ class TestProjectSet(TestProject): ] 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 @@ class TestProjectSet(TestProject): identity_fakes.project_id, **kwargs ) + self.assertIsNone(result) def test_project_set_description(self): arglist = [ @@ -449,8 +450,7 @@ class TestProjectSet(TestProject): ] 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 @@ class TestProjectSet(TestProject): identity_fakes.project_id, **kwargs ) + self.assertIsNone(result) def test_project_set_enable(self): arglist = [ @@ -475,8 +476,7 @@ class TestProjectSet(TestProject): ] 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 @@ class TestProjectSet(TestProject): identity_fakes.project_id, **kwargs ) + self.assertIsNone(result) def test_project_set_disable(self): arglist = [ @@ -501,8 +502,7 @@ class TestProjectSet(TestProject): ] 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 @@ class TestProjectSet(TestProject): identity_fakes.project_id, **kwargs ) + self.assertIsNone(result) def test_project_set_property(self): arglist = [ @@ -527,8 +528,7 @@ class TestProjectSet(TestProject): ] 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 @@ class TestProjectSet(TestProject): identity_fakes.project_id, **kwargs ) + self.assertIsNone(result) class TestProjectShow(TestProject): @@ -615,7 +616,7 @@ class TestProjectUnset(TestProject): 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, diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py index a7332e63..9afe4ad1 100644 --- a/openstackclient/tests/identity/v2_0/test_user.py +++ b/openstackclient/tests/identity/v2_0/test_user.py @@ -558,8 +558,9 @@ class TestUserSet(TestUser): ] 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 = [ |