Move setup_servers_mock() to class TestServer.

This function will be used in almost every test case.
So move it to the base class to avoid define it each
time a test case is added.

Change-Id: I060b54f0935b42a85042ad217d851fea649ec8d9
Implements: blueprint osc-unit-test-framework-improvement
This commit is contained in:
Tang Chen
2015-11-26 13:25:16 +08:00
parent 487fff8cdb
commit bf657ef286

View File

@@ -52,6 +52,19 @@ class TestServer(compute_fakes.TestComputev2):
self.volumes_mock = self.app.client_manager.volume.volumes
self.volumes_mock.reset_mock()
# 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,
count=count)
# This is the return value for utils.find_resource()
self.servers_mock.get = compute_fakes.FakeServer.get_servers(servers,
0)
return servers
class TestServerCreate(TestServer):
@@ -569,18 +582,6 @@ class TestServerPause(TestServer):
'pause': None,
}
def setup_servers_mock(self, count=1):
servers = compute_fakes.FakeServer.create_servers(
methods=self.methods,
count=count)
# This is the return value for utils.find_resource()
self.servers_mock.get = compute_fakes.FakeServer.get_servers(
servers,
1)
return servers
def test_server_pause_one_server(self):
servers = self.setup_servers_mock(1)
@@ -809,17 +810,6 @@ class TestShelveServer(TestServer):
'shelve': None,
}
def setup_servers_mock(self, count=1):
servers = compute_fakes.FakeServer.create_servers(
methods=self.methods,
count=count)
self.servers_mock.get = compute_fakes.FakeServer.get_servers(
servers,
1)
return servers
def test_shelve_one_server(self):
server = self.setup_servers_mock(1)[0]