summaryrefslogtreecommitdiffstats
path: root/test/unit/proxy/test_server.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit/proxy/test_server.py')
-rw-r--r--test/unit/proxy/test_server.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 490e8fc..3745a9f 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -75,7 +75,7 @@ def request_init(self, *args, **kwargs):
_request_instances[self] = None
-def setup():
+def do_setup(the_object_server):
utils.HASH_PATH_SUFFIX = 'endcap'
global _testdir, _test_servers, _test_sockets, \
_orig_container_listing_limit, _test_coros
@@ -147,8 +147,8 @@ def setup():
acc2srv = account_server.AccountController(conf)
con1srv = container_server.ContainerController(conf)
con2srv = container_server.ContainerController(conf)
- obj1srv = object_server.ObjectController(conf)
- obj2srv = object_server.ObjectController(conf)
+ obj1srv = the_object_server.ObjectController(conf)
+ obj2srv = the_object_server.ObjectController(conf)
_test_servers = \
(prosrv, acc1srv, acc2srv, con1srv, con2srv, obj1srv, obj2srv)
nl = DebugLogger()
@@ -190,6 +190,10 @@ def setup():
exp, headers[:len(exp)])
+def setup():
+ do_setup(object_server)
+
+
def teardown():
for server in _test_coros:
server.kill()