summaryrefslogtreecommitdiff
path: root/openstackclient/tests/identity/v3/test_endpoint.py
diff options
context:
space:
mode:
authorTang Chen <chen.tang@easystack.cn>2016-03-05 17:12:42 +0800
committerTang Chen <chen.tang@easystack.cn>2016-03-05 17:12:42 +0800
commiteb1574281b84e86ee4c4b65d900e1de82c24471e (patch)
tree7a63847be854e6c89a078fae51eefe52accf5e23 /openstackclient/tests/identity/v3/test_endpoint.py
parentfa3a34322c532c6ae09b7b21c305b6a92d99300a (diff)
downloadpython-openstackclient-eb1574281b84e86ee4c4b65d900e1de82c24471e.tar.gz
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
Diffstat (limited to 'openstackclient/tests/identity/v3/test_endpoint.py')
-rw-r--r--openstackclient/tests/identity/v3/test_endpoint.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/openstackclient/tests/identity/v3/test_endpoint.py b/openstackclient/tests/identity/v3/test_endpoint.py
index 1c481930..d953459c 100644
--- a/openstackclient/tests/identity/v3/test_endpoint.py
+++ b/openstackclient/tests/identity/v3/test_endpoint.py
@@ -277,12 +277,12 @@ class TestEndpointDelete(TestEndpoint):
]
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.endpoints_mock.delete.assert_called_with(
identity_fakes.endpoint_id,
)
+ self.assertIsNone(result)
class TestEndpointList(TestEndpoint):
@@ -483,10 +483,10 @@ class TestEndpointSet(TestEndpoint):
]
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.endpoints_mock.update)
+ self.assertIsNone(result)
def test_endpoint_set_interface(self):
arglist = [
@@ -499,8 +499,7 @@ class TestEndpointSet(TestEndpoint):
]
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 +513,7 @@ class TestEndpointSet(TestEndpoint):
identity_fakes.endpoint_id,
**kwargs
)
+ self.assertIsNone(result)
def test_endpoint_set_url(self):
arglist = [
@@ -526,8 +526,7 @@ class TestEndpointSet(TestEndpoint):
]
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 = {
@@ -541,6 +540,7 @@ class TestEndpointSet(TestEndpoint):
identity_fakes.endpoint_id,
**kwargs
)
+ self.assertIsNone(result)
def test_endpoint_set_service(self):
arglist = [
@@ -553,8 +553,7 @@ class TestEndpointSet(TestEndpoint):
]
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 = {
@@ -568,6 +567,7 @@ class TestEndpointSet(TestEndpoint):
identity_fakes.endpoint_id,
**kwargs
)
+ self.assertIsNone(result)
def test_endpoint_set_region(self):
arglist = [
@@ -580,8 +580,7 @@ class TestEndpointSet(TestEndpoint):
]
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 = {
@@ -595,6 +594,7 @@ class TestEndpointSet(TestEndpoint):
identity_fakes.endpoint_id,
**kwargs
)
+ self.assertIsNone(result)
def test_endpoint_set_enable(self):
arglist = [
@@ -607,8 +607,7 @@ class TestEndpointSet(TestEndpoint):
]
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 = {
@@ -622,6 +621,7 @@ class TestEndpointSet(TestEndpoint):
identity_fakes.endpoint_id,
**kwargs
)
+ self.assertIsNone(result)
def test_endpoint_set_disable(self):
arglist = [
@@ -634,8 +634,7 @@ class TestEndpointSet(TestEndpoint):
]
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 = {
@@ -649,6 +648,7 @@ class TestEndpointSet(TestEndpoint):
identity_fakes.endpoint_id,
**kwargs
)
+ self.assertIsNone(result)
class TestEndpointShow(TestEndpoint):