x/swiftonfile
Code Issues Proposed changes

Remove reliance on /tmp/foo ...

Browse Source 
Change-Id: I1add2e7e74b59bf24ef46d9053723f0243ee08c5
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5984
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
This commit is contained in:
Peter Portante 2013-09-20 16:43:48 -04:00 committed by Luis Pabon
parent 1eb16d149f
commit 4e6787724c
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/unit/obj/test_diskfile.py
View File

@ -106,14 +106,13 @@ class TestDiskFile(unittest.TestCase):
shutil.rmtree(self.td) shutil.rmtree(self.td)
def test_constructor_no_slash(self): def test_constructor_no_slash(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar", "z", self.lg)
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar", "z", self.lg)
assert gdf._obj == "z" assert gdf._obj == "z"
assert gdf._obj_path == "" assert gdf._obj_path == ""
assert gdf.name == "bar" assert gdf.name == "bar"
assert gdf.datadir == "/tmp/foo/vol0/bar" assert gdf.datadir == os.path.join(self.td, "vol0", "bar")
assert gdf.device_path == "/tmp/foo/vol0" assert gdf.device_path == os.path.join(self.td, "vol0")
assert gdf._container_path == "/tmp/foo/vol0/bar" assert gdf._container_path == os.path.join(self.td, "vol0", "bar")
assert gdf.disk_chunk_size == 65536 assert gdf.disk_chunk_size == 65536
assert gdf.iter_hook == None assert gdf.iter_hook == None
assert gdf.logger == self.lg assert gdf.logger == self.lg
@ -131,14 +130,13 @@ class TestDiskFile(unittest.TestCase):
assert not gdf._is_dir assert not gdf._is_dir
def test_constructor_leadtrail_slash(self): def test_constructor_leadtrail_slash(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar", "/b/a/z/",
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar", "/b/a/z/",
self.lg) self.lg)
assert gdf._obj == "z" assert gdf._obj == "z"
assert gdf._obj_path == "b/a" assert gdf._obj_path == os.path.join("b", "a")
assert gdf.name == "bar/b/a" assert gdf.name == os.path.join("bar", "b", "a")
assert gdf.datadir == "/tmp/foo/vol0/bar/b/a" assert gdf.datadir == os.path.join(self.td, "vol0", "bar", "b", "a")
assert gdf.device_path == "/tmp/foo/vol0" assert gdf.device_path == os.path.join(self.td, "vol0")
def test_constructor_no_metadata(self): def test_constructor_no_metadata(self):
the_path = os.path.join(self.td, "vol0", "bar") the_path = os.path.join(self.td, "vol0", "bar")
@ -242,20 +240,17 @@ class TestDiskFile(unittest.TestCase):
assert gdf.fp is not None assert gdf.fp is not None
def test_constructor_chunk_size(self): def test_constructor_chunk_size(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar", "z", self.lg,
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar", "z", self.lg,
disk_chunk_size=8192) disk_chunk_size=8192)
assert gdf.disk_chunk_size == 8192 assert gdf.disk_chunk_size == 8192
def test_constructor_iter_hook(self): def test_constructor_iter_hook(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar", "z", self.lg,
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar", "z", self.lg,
iter_hook='hook') iter_hook='hook')
assert gdf.iter_hook == 'hook' assert gdf.iter_hook == 'hook'
def test_close_no_open_fp(self): def test_close_no_open_fp(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar",
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar",
"z", self.lg, keep_data_fp=True) "z", self.lg, keep_data_fp=True)
gdf._is_dir = False gdf._is_dir = False
self.called = False self.called = False
@ -302,10 +297,9 @@ class TestDiskFile(unittest.TestCase):
assert self.called assert self.called
def test_is_deleted(self): def test_is_deleted(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar", "z", self.lg)
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar", "z", self.lg)
assert gdf.is_deleted() assert gdf.is_deleted()
gdf.data_file = "/tmp/foo/bar" gdf.data_file = os.path.join(self.td, "bar")
assert not gdf.is_deleted() assert not gdf.is_deleted()
def test_create_dir_object_no_md(self): def test_create_dir_object_no_md(self):
@ -389,8 +383,7 @@ class TestDiskFile(unittest.TestCase):
assert _metadata[the_dir] == md assert _metadata[the_dir] == md
def test_put_w_tombstone(self): def test_put_w_tombstone(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar", "z", self.lg)
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar", "z", self.lg)
assert gdf.metadata == {} assert gdf.metadata == {}
gdf.put_metadata({'x': '1'}, tombstone=True) gdf.put_metadata({'x': '1'}, tombstone=True)
@ -634,8 +627,7 @@ class TestDiskFile(unittest.TestCase):
assert not os.path.exists(tmppath) assert not os.path.exists(tmppath)
def test_unlinkold_no_metadata(self): def test_unlinkold_no_metadata(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar",
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar",
"z", self.lg) "z", self.lg)
assert gdf.metadata == {} assert gdf.metadata == {}
_saved_rmobjdir = gluster.swift.obj.diskfile.rmobjdir _saved_rmobjdir = gluster.swift.obj.diskfile.rmobjdir
@ -648,8 +640,7 @@ class TestDiskFile(unittest.TestCase):
gluster.swift.obj.diskfile.rmobjdir = _saved_rmobjdir gluster.swift.obj.diskfile.rmobjdir = _saved_rmobjdir
def test_unlinkold_same_timestamp(self): def test_unlinkold_same_timestamp(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar",
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar",
"z", self.lg) "z", self.lg)
assert gdf.metadata == {} assert gdf.metadata == {}
gdf.metadata['X-Timestamp'] = 1 gdf.metadata['X-Timestamp'] = 1
@ -778,8 +769,7 @@ class TestDiskFile(unittest.TestCase):
assert 4 == gdf.metadata['Content-Length'] assert 4 == gdf.metadata['Content-Length']
def test_get_data_file_size_dne(self): def test_get_data_file_size_dne(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar",
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar",
"/b/a/z/", self.lg) "/b/a/z/", self.lg)
try: try:
gdf.get_data_file_size() gdf.get_data_file_size()
@ -847,8 +837,7 @@ class TestDiskFile(unittest.TestCase):
assert 0 == gdf.get_data_file_size() assert 0 == gdf.get_data_file_size()
def test_filter_metadata(self): def test_filter_metadata(self):
assert not os.path.exists("/tmp/foo") gdf = DiskFile(self.td, "vol0", "p57", "ufo47", "bar",
gdf = DiskFile("/tmp/foo", "vol0", "p57", "ufo47", "bar",
"z", self.lg) "z", self.lg)
assert gdf.metadata == {} assert gdf.metadata == {}
gdf._filter_metadata() gdf._filter_metadata()