diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 04:03:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 04:03:00 +0000 |
| commit | 487fff8cdbabc9629e070b50e9ce3a762e2b180c (patch) | |
| tree | c1698f8820f2453ac0a0ddf2d07d1e335d1a56f1 /openstackclient/tests/compute/v2/test_server.py | |
| parent | bf273985e9cf3f601a9e6aedd88b684c69558ec7 (diff) | |
| parent | b3c2668c341da42ce7f193b1035f7ab352538d95 (diff) | |
| download | python-openstackclient-487fff8cdbabc9629e070b50e9ce3a762e2b180c.tar.gz | |
Merge "Move FakeServer to tests.common.v2.compute.fakes"
Diffstat (limited to 'openstackclient/tests/compute/v2/test_server.py')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 710ee01b..a975a537 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -61,7 +61,8 @@ class TestServerCreate(TestServer): attrs = { 'networks': {}, } - self.new_server = fakes.FakeServer.create_one_server(attrs=attrs) + self.new_server = compute_fakes.FakeServer.create_one_server( + attrs=attrs) # This is the return value for utils.find_resource(). # This is for testing --wait option. @@ -398,7 +399,7 @@ class TestServerDelete(TestServer): def setUp(self): super(TestServerDelete, self).setUp() - self.server = fakes.FakeServer.create_one_server() + self.server = compute_fakes.FakeServer.create_one_server() # This is the return value for utils.find_resource() self.servers_mock.get.return_value = self.server @@ -476,7 +477,7 @@ class TestServerImageCreate(TestServer): def setUp(self): super(TestServerImageCreate, self).setUp() - self.server = fakes.FakeServer.create_one_server() + self.server = compute_fakes.FakeServer.create_one_server() # This is the return value for utils.find_resource() self.servers_mock.get.return_value = self.server @@ -569,11 +570,14 @@ class TestServerPause(TestServer): } def setup_servers_mock(self, count=1): - servers = fakes.FakeServer.create_servers(methods=self.methods, - count=count) + servers = compute_fakes.FakeServer.create_servers( + methods=self.methods, + count=count) # This is the return value for utils.find_resource() - self.servers_mock.get = fakes.FakeServer.get_servers(servers, 1) + self.servers_mock.get = compute_fakes.FakeServer.get_servers( + servers, + 1) return servers @@ -617,7 +621,7 @@ class TestServerResize(TestServer): def setUp(self): super(TestServerResize, self).setUp() - self.server = fakes.FakeServer.create_one_server() + self.server = compute_fakes.FakeServer.create_one_server() # This is the return value for utils.find_resource() self.servers_mock.get.return_value = self.server @@ -806,10 +810,13 @@ class TestShelveServer(TestServer): } def setup_servers_mock(self, count=1): - servers = fakes.FakeServer.create_servers(methods=self.methods, - count=count) + servers = compute_fakes.FakeServer.create_servers( + methods=self.methods, + count=count) - self.servers_mock.get = fakes.FakeServer.get_servers(servers, 1) + self.servers_mock.get = compute_fakes.FakeServer.get_servers( + servers, + 1) return servers |