summaryrefslogtreecommitdiffstats
path: root/test/unit/common/test_diskdir.py
diff options
context:
space:
mode:
authorLuis Pabon <lpabon@redhat.com>2013-05-29 21:19:43 -0400
committerPeter Portante <pportant@redhat.com>2013-06-03 16:52:15 -0700
commit40c313378e5fffb846f1fd143573a687e2774b28 (patch)
treedc6dd6e05c8a4abe1eba31bc25f849c86df8be96 /test/unit/common/test_diskdir.py
parent31a2ef1935133f224169a1315a91a2d9e9775d9a (diff)
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 <lpabon@redhat.com> Reviewed-on: http://review.gluster.org/5113 Reviewed-by: Peter Portante <pportant@redhat.com> Tested-by: Peter Portante <pportant@redhat.com>
Diffstat (limited to 'test/unit/common/test_diskdir.py')
-rw-r--r--test/unit/common/test_diskdir.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/unit/common/test_diskdir.py b/test/unit/common/test_diskdir.py
index 733cc17..ba04e7f 100644
--- a/test/unit/common/test_diskdir.py
+++ b/test/unit/common/test_diskdir.py
@@ -43,15 +43,17 @@ def setup():
if e.errno != errno.EEXIST:
raise
+
+import gluster.swift.common.DiskDir as dd
+
+
def teardown():
+ dd._db_file = ""
shutil.rmtree(gluster.swift.common.Glusterfs.RUN_DIR)
gluster.swift.common.Glusterfs.RUN_DIR = _saved_RUN_DIR
gluster.swift.common.Glusterfs._do_getsize = _saved_do_getsize
-import gluster.swift.common.DiskDir as dd
-
-
def timestamp_in_range(ts, base):
low = normalize_timestamp(base - 5)
high = normalize_timestamp(base + 5)