summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute
diff options
context:
space:
mode:
authorTang Chen <chen.tang@easystack.cn>2016-02-04 16:04:06 +0800
committerTang Chen <chen.tang@easystack.cn>2016-02-06 08:43:55 +0800
commit1740218728ca55c50ec8d133de4acd379bce4f9c (patch)
treecd8962036736b1a56ceb6955746f7724908141b2 /openstackclient/tests/compute
parent553631a5d46e65f7da3323f87ea1c6d020d4f5d7 (diff)
downloadpython-openstackclient-1740218728ca55c50ec8d133de4acd379bce4f9c.tar.gz
Define security_group_rules mock in FakeComputev2Client
security_group_rules mock should be defined in FakeComputev2Client, and used in each test class. Change-Id: I44bb6379b2c1b6cb277296e08e25dd4d7255c276
Diffstat (limited to 'openstackclient/tests/compute')
-rw-r--r--openstackclient/tests/compute/v2/fakes.py3
-rw-r--r--openstackclient/tests/compute/v2/test_security_group_rule.py8
2 files changed, 6 insertions, 5 deletions
diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py
index 051d8d54..9e57fd97 100644
--- a/openstackclient/tests/compute/v2/fakes.py
+++ b/openstackclient/tests/compute/v2/fakes.py
@@ -121,6 +121,9 @@ class FakeComputev2Client(object):
self.security_groups = mock.Mock()
self.security_groups.resource_class = fakes.FakeResource(None, {})
+ self.security_group_rules = mock.Mock()
+ self.security_group_rules.resource_class = fakes.FakeResource(None, {})
+
self.auth_token = kwargs['token']
self.management_url = kwargs['endpoint']
diff --git a/openstackclient/tests/compute/v2/test_security_group_rule.py b/openstackclient/tests/compute/v2/test_security_group_rule.py
index 37eed333..749f34de 100644
--- a/openstackclient/tests/compute/v2/test_security_group_rule.py
+++ b/openstackclient/tests/compute/v2/test_security_group_rule.py
@@ -12,7 +12,6 @@
#
import copy
-import mock
from openstackclient.compute.v2 import security_group
from openstackclient.tests.compute.v2 import fakes as compute_fakes
@@ -106,10 +105,9 @@ class TestSecurityGroupRule(compute_fakes.TestComputev2):
self.secgroups_mock = self.app.client_manager.compute.security_groups
self.secgroups_mock.reset_mock()
- self.sg_rules_mock = mock.Mock()
- self.sg_rules_mock.resource_class = fakes.FakeResource(None, {})
- self.app.client_manager.compute.security_group_rules = \
- self.sg_rules_mock
+ # Get a shortcut compute client security_group_rules mock
+ self.sg_rules_mock = \
+ self.app.client_manager.compute.security_group_rules
self.sg_rules_mock.reset_mock()