From 1740218728ca55c50ec8d133de4acd379bce4f9c Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Thu, 4 Feb 2016 16:04:06 +0800 Subject: [PATCH] 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 --- openstackclient/tests/compute/v2/fakes.py | 3 +++ .../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 051d8d545a..9e57fd97ac 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 37eed33317..749f34debd 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()