dry out container unittests
Change Ifcc4392ffa4df485ce3c62a35d0fcc8c93de74aa introduced TestContainerController4Replicas as a subclass of TestContainerController. And there is duplicated code block to override setUp method. This patch removed the duplicated code block. Change-Id: Iad0b64cba52554b89dbd959475a2ce7c0d9a20eb
This commit is contained in:
parent
d9f500a128
commit
cfd5021235
@ -32,10 +32,14 @@ from test.unit.proxy.test_server import node_error_count
|
|||||||
|
|
||||||
@patch_policies([StoragePolicy(0, 'zero', True, object_ring=FakeRing())])
|
@patch_policies([StoragePolicy(0, 'zero', True, object_ring=FakeRing())])
|
||||||
class TestContainerController(TestRingBase):
|
class TestContainerController(TestRingBase):
|
||||||
|
|
||||||
|
CONTAINER_REPLICAS = 3
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
TestRingBase.setUp(self)
|
TestRingBase.setUp(self)
|
||||||
self.logger = debug_logger()
|
self.logger = debug_logger()
|
||||||
self.container_ring = FakeRing(max_more_nodes=9)
|
self.container_ring = FakeRing(replicas=self.CONTAINER_REPLICAS,
|
||||||
|
max_more_nodes=9)
|
||||||
self.app = proxy_server.Application(None, FakeMemcache(),
|
self.app = proxy_server.Application(None, FakeMemcache(),
|
||||||
logger=self.logger,
|
logger=self.logger,
|
||||||
account_ring=FakeRing(),
|
account_ring=FakeRing(),
|
||||||
@ -266,41 +270,8 @@ class TestContainerController(TestRingBase):
|
|||||||
@patch_policies(
|
@patch_policies(
|
||||||
[StoragePolicy(0, 'zero', True, object_ring=FakeRing(replicas=4))])
|
[StoragePolicy(0, 'zero', True, object_ring=FakeRing(replicas=4))])
|
||||||
class TestContainerController4Replicas(TestContainerController):
|
class TestContainerController4Replicas(TestContainerController):
|
||||||
def setUp(self):
|
|
||||||
TestRingBase.setUp(self)
|
|
||||||
self.logger = debug_logger()
|
|
||||||
self.container_ring = FakeRing(replicas=4, max_more_nodes=9)
|
|
||||||
self.app = proxy_server.Application(None, FakeMemcache(),
|
|
||||||
logger=self.logger,
|
|
||||||
account_ring=FakeRing(replicas=4),
|
|
||||||
container_ring=self.container_ring)
|
|
||||||
|
|
||||||
self.account_info = {
|
CONTAINER_REPLICAS = 4
|
||||||
'status': 200,
|
|
||||||
'container_count': '10',
|
|
||||||
'total_object_count': '100',
|
|
||||||
'bytes': '1000',
|
|
||||||
'meta': {},
|
|
||||||
'sysmeta': {},
|
|
||||||
}
|
|
||||||
|
|
||||||
class FakeAccountInfoContainerController(
|
|
||||||
proxy_server.ContainerController):
|
|
||||||
|
|
||||||
def account_info(controller, *args, **kwargs):
|
|
||||||
patch_path = 'swift.proxy.controllers.base.get_info'
|
|
||||||
with mock.patch(patch_path) as mock_get_info:
|
|
||||||
mock_get_info.return_value = dict(self.account_info)
|
|
||||||
return super(FakeAccountInfoContainerController,
|
|
||||||
controller).account_info(
|
|
||||||
*args, **kwargs)
|
|
||||||
_orig_get_controller = self.app.get_controller
|
|
||||||
|
|
||||||
def wrapped_get_controller(*args, **kwargs):
|
|
||||||
with mock.patch('swift.proxy.server.ContainerController',
|
|
||||||
new=FakeAccountInfoContainerController):
|
|
||||||
return _orig_get_controller(*args, **kwargs)
|
|
||||||
self.app.get_controller = wrapped_get_controller
|
|
||||||
|
|
||||||
def test_response_code_for_PUT(self):
|
def test_response_code_for_PUT(self):
|
||||||
PUT_TEST_CASES = [
|
PUT_TEST_CASES = [
|
||||||
|
Loading…
Reference in New Issue
Block a user