x/swiftonhpss
Code Issues Proposed changes

Remove unused is_marker method from utils.

Browse Source 
Change-Id: I67f695b57405465c7bec22c437c2169403fa59dd
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5089
Reviewed-by: Mohammed Junaid <junaid@redhat.com>
Tested-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
This commit is contained in:
Peter Portante 2013-05-24 11:50:02 -04:00 committed by Luis Pabon
parent f58af3ac29
commit 1811a9b05e
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gluster/swift/common/utils.py
View File

@ -230,22 +230,6 @@ def validate_object(metadata):
return False
def is_marker(metadata):
if not metadata:
logging.warn('is_marker: No metadata')
return False
if X_OBJECT_TYPE not in metadata.keys():
logging.warn('is_marker: X_OBJECT_TYPE missing from metadata: %s',
metadata)
return False
if metadata[X_OBJECT_TYPE] == MARKER_DIR:
return True
else:
return False
def _update_list(path, cont_path, src_list, reg_file=True, object_count=0,
bytes_used=0, obj_list=[]):
# strip the prefix off, also stripping the leading and trailing slashes

14
test/unit/common/test_utils.py
View File

@ -1004,17 +1004,3 @@ class TestUtils(unittest.TestCase):
utils.X_OBJECT_TYPE: 'na' }
ret = utils.validate_object(md)
assert ret
def test_is_marker_empty(self):
assert False == utils.is_marker(None)
def test_is_marker_missing(self):
assert False == utils.is_marker( { 'foo': 'bar' } )
def test_is_marker_not_marker(self):
md = { utils.X_OBJECT_TYPE: utils.DIR }
assert False == utils.is_marker(md)
def test_is_marker(self):
md = { utils.X_OBJECT_TYPE: utils.MARKER_DIR }
assert utils.is_marker(md)