diff options
author | Peter Portante <peter.portante@redhat.com> | 2013-09-20 11:25:04 -0400 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2013-10-29 07:25:59 -0700 |
commit | 100d6b01bd40d8b01335e5ecd4a592df79e75b63 (patch) | |
tree | fb6875e07b37808b56aa2f0078040c9ef480a58e /test/unit/proxy/test_server.py | |
parent | 70a4cef96c42fe30e62d23ae816a330d3d35df63 (diff) |
Rebase to lastest OpenStack Swift DiskFile API
As of October 28th, 2013, we rebase to OpenStack Swift master (commit
4bfe674) to pick up the lastest officially supported DiskFile API
changes. We use a snapshot of OpenStack Swift stored in the
gluster-swift launchpad downloads area so that we can deliberately
rebase at our own pace.
With this refactoring, all the code for handling I/O is wholly
contained in the swift tree for object operations. This will allow us
to use a different fs_utils implementation in the future (for example,
one based on a yet-to-be-implemented python bindings over libgfapi).
This also means the "Fake_file" class has been removed entirely.
Change-Id: I767983f88c59786e30b6c64da16d1cb6ab3c3e7f
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5993
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'test/unit/proxy/test_server.py')
-rw-r--r-- | test/unit/proxy/test_server.py | 10 |
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() |