summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-02 03:04:23 +0000
committerGerrit Code Review <review@openstack.org>2015-12-02 03:04:23 +0000
commitfdcb56d7c476fd722d3926f57dff7906a4285120 (patch)
tree5fafd39afeb7bd9262b76822c8f0a95d535a604d /openstackclient
parenta9a7caf934f36c95727c30bdf2b1275609d3c0fc (diff)
parentd37d27b2d6fd09b4b8ca111057f894a55725c579 (diff)
downloadpython-openstackclient-fdcb56d7c476fd722d3926f57dff7906a4285120.tar.gz
Merge "Enable setup_servers_mock() to take attributes param."
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/compute/v2/test_server.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index a750ed5d..6cc314e8 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -53,11 +53,15 @@ class TestServer(compute_fakes.TestComputev2):
self.volumes_mock = self.app.client_manager.volume.volumes
self.volumes_mock.reset_mock()
+ # Set object attributes to be tested. Could be overwriten in subclass.
+ self.attrs = {}
+
# Set object methods to be tested. Could be overwriten in subclass.
self.methods = {}
def setup_servers_mock(self, count):
- servers = compute_fakes.FakeServer.create_servers(methods=self.methods,
+ servers = compute_fakes.FakeServer.create_servers(attrs=self.attrs,
+ methods=self.methods,
count=count)
# This is the return value for utils.find_resource()