From 7b38b9a19a10a63ad490af95a1866c1222e59159 Mon Sep 17 00:00:00 2001 From: gholt Date: Tue, 13 Jul 2010 14:23:39 -0700 Subject: [PATCH] Make unit tests not require /etc/swift/*.ring.gz files --- swift/proxy/server.py | 11 +++++++---- test/unit/proxy/test_server.py | 21 +++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/swift/proxy/server.py b/swift/proxy/server.py index a0804826ad..102afa68e6 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -934,7 +934,8 @@ class BaseApplication(object): log_name = 'base_application' - def __init__(self, conf, memcache, logger=None): + def __init__(self, conf, memcache, logger=None, account_ring=None, + container_ring=None, object_ring=None): if logger: self.logger = logger else: @@ -961,10 +962,12 @@ class BaseApplication(object): int(conf.get('recheck_account_existence', 60)) self.resellers_conf = ConfigParser() self.resellers_conf.read(os.path.join(swift_dir, 'resellers.conf')) - self.object_ring = Ring(os.path.join(swift_dir, 'object.ring.gz')) - self.container_ring = \ + self.object_ring = object_ring or \ + Ring(os.path.join(swift_dir, 'object.ring.gz')) + self.container_ring = container_ring or \ Ring(os.path.join(swift_dir, 'container.ring.gz')) - self.account_ring = Ring(os.path.join(swift_dir, 'account.ring.gz')) + self.account_ring = account_ring or \ + Ring(os.path.join(swift_dir, 'account.ring.gz')) self.memcache = memcache self.rate_limit = float(conf.get('rate_limit', 20000.0)) self.account_rate_limit = float(conf.get('account_rate_limit', 200.0)) diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index c7180e0a41..ad96f812a2 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -191,10 +191,9 @@ def save_globals(): class TestObjectController(unittest.TestCase): def setUp(self): - self.app = proxy_server.Application(None, FakeMemcache()) - self.app.object_ring = FakeRing() - self.app.container_ring = FakeRing() - self.app.account_ring = FakeRing() + self.app = proxy_server.Application(None, FakeMemcache(), + account_ring=FakeRing(), container_ring=FakeRing(), + object_ring=FakeRing()) def assert_status_map(self, method, statuses, expected, raise_exc=False): with save_globals(): @@ -1447,10 +1446,9 @@ class TestContainerController(unittest.TestCase): "Test swift.proxy_server.ContainerController" def setUp(self): - self.app = proxy_server.Application(None, FakeMemcache()) - self.app.object_ring = FakeRing() - self.app.container_ring = FakeRing() - self.app.account_ring = FakeRing() + self.app = proxy_server.Application(None, FakeMemcache(), + account_ring=FakeRing(), container_ring=FakeRing(), + object_ring=FakeRing()) def assert_status_map(self, method, statuses, expected, raise_exc=False, missing_container=False): with save_globals(): @@ -1635,10 +1633,9 @@ class TestContainerController(unittest.TestCase): class TestAccountController(unittest.TestCase): def setUp(self): - self.app = proxy_server.Application(None, FakeMemcache()) - self.app.object_ring = FakeRing() - self.app.container_ring = FakeRing() - self.app.account_ring = FakeRing() + self.app = proxy_server.Application(None, FakeMemcache(), + account_ring=FakeRing(), container_ring=FakeRing(), + object_ring=FakeRing) def assert_status_map(self, method, statuses, expected): with save_globals():