From 40c313378e5fffb846f1fd143573a687e2774b28 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Wed, 29 May 2013 21:19:43 -0400 Subject: Copy proxy unit test from OpenStack Swift This is a copy of the proxy unit test from OpenStack Swift. The file has minor changes to make it compatible with Gluster For Swift. Change-Id: I64a0f8d274461eb2a2c38524c6282e0d3d3d1457 Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/5113 Reviewed-by: Peter Portante Tested-by: Peter Portante --- gluster/swift/common/DiskDir.py | 14 +++++++++++--- gluster/swift/common/DiskFile.py | 1 + gluster/swift/proxy/server.py | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'gluster') diff --git a/gluster/swift/common/DiskDir.py b/gluster/swift/common/DiskDir.py index 36d8b79..a0c9a51 100644 --- a/gluster/swift/common/DiskDir.py +++ b/gluster/swift/common/DiskDir.py @@ -30,9 +30,7 @@ from gluster.swift.common import Glusterfs DATADIR = 'containers' # Create a dummy db_file in Glusterfs.RUN_DIR -_db_file = os.path.join(Glusterfs.RUN_DIR, 'db_file.db') -if not os.path.exists(_db_file): - file(_db_file, 'w+') +_db_file = "" def _read_metadata(dd): @@ -224,6 +222,12 @@ class DiskDir(DiskCommon): self.container_info = None self.uid = int(uid) self.gid = int(gid) + # Create a dummy db_file in Glusterfs.RUN_DIR + global _db_file + if not _db_file: + _db_file = os.path.join(Glusterfs.RUN_DIR, 'db_file.db') + if not os.path.exists(_db_file): + file(_db_file, 'w+') self.db_file = _db_file self.dir_exists = os_path.exists(self.datadir) if self.dir_exists: @@ -468,6 +472,10 @@ class DiskAccount(DiskDir): super(DiskAccount, self).__init__(root, drive, account, None, logger) assert self.dir_exists + def is_status_deleted(self): + """Only returns true if the status field is set to DELETED.""" + return False + def initialize(self, timestamp): """ Create and write metatdata to directory/account. diff --git a/gluster/swift/common/DiskFile.py b/gluster/swift/common/DiskFile.py index c74921b..a3f7987 100644 --- a/gluster/swift/common/DiskFile.py +++ b/gluster/swift/common/DiskFile.py @@ -112,6 +112,7 @@ class Gluster_DiskFile(DiskFile): self.keep_cache = False self.uid = int(uid) self.gid = int(gid) + self.suppress_file_closing = False # Don't store a value for data_file until we know it exists. self.data_file = None diff --git a/gluster/swift/proxy/server.py b/gluster/swift/proxy/server.py index df9b245..d209186 100644 --- a/gluster/swift/proxy/server.py +++ b/gluster/swift/proxy/server.py @@ -21,7 +21,7 @@ import gluster.swift.common.constraints # noqa from swift.proxy import server -def app_factory(global_conf, **local_conf): +def app_factory(global_conf, **local_conf): # noqa """paste.deploy app factory for creating WSGI proxy apps.""" conf = global_conf.copy() conf.update(local_conf) -- cgit