From eb1574281b84e86ee4c4b65d900e1de82c24471e Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Sat, 5 Mar 2016 17:12:42 +0800
Subject: 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
---
 .../tests/identity/v2_0/test_project.py            | 31 +++++++++++-----------
 openstackclient/tests/identity/v2_0/test_user.py   |  5 ++--
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'openstackclient/tests/identity/v2_0')

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 = [
-- 
cgit v1.2.1