diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-08 07:10:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-08 07:10:58 +0000 |
| commit | f0f9b5096cf0f56c3dca721d85f08fab71715868 (patch) | |
| tree | 3a0489a6d45925045279fa91b81707bd782dd533 /openstackclient/tests | |
| parent | 3a93c35f348f9680bc6769a60ddcf6014b7fb72d (diff) | |
| parent | 1740218728ca55c50ec8d133de4acd379bce4f9c (diff) | |
| download | python-openstackclient-f0f9b5096cf0f56c3dca721d85f08fab71715868.tar.gz | |
Merge "Define security_group_rules mock in FakeComputev2Client"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/compute/v2/fakes.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_security_group_rule.py | 8 |
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() |