Skip to content

Commit f0f9b50

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Define security_group_rules mock in FakeComputev2Client"
2 parents 3a93c35 + 1740218 commit f0f9b50

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

openstackclient/tests/compute/v2/fakes.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ def __init__(self, **kwargs):
121121
self.security_groups = mock.Mock()
122122
self.security_groups.resource_class = fakes.FakeResource(None, {})
123123

124+
self.security_group_rules = mock.Mock()
125+
self.security_group_rules.resource_class = fakes.FakeResource(None, {})
126+
124127
self.auth_token = kwargs['token']
125128

126129
self.management_url = kwargs['endpoint']

openstackclient/tests/compute/v2/test_security_group_rule.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#
1313

1414
import copy
15-
import mock
1615

1716
from openstackclient.compute.v2 import security_group
1817
from openstackclient.tests.compute.v2 import fakes as compute_fakes
@@ -106,10 +105,9 @@ def setUp(self):
106105
self.secgroups_mock = self.app.client_manager.compute.security_groups
107106
self.secgroups_mock.reset_mock()
108107

109-
self.sg_rules_mock = mock.Mock()
110-
self.sg_rules_mock.resource_class = fakes.FakeResource(None, {})
111-
self.app.client_manager.compute.security_group_rules = \
112-
self.sg_rules_mock
108+
# Get a shortcut compute client security_group_rules mock
109+
self.sg_rules_mock = \
110+
self.app.client_manager.compute.security_group_rules
113111
self.sg_rules_mock.reset_mock()
114112

115113

0 commit comments

Comments
 (0)