summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Pabon <lpabon@redhat.com>2013-07-09 15:41:43 -0400
committerPeter Portante <pportant@redhat.com>2013-07-09 18:20:05 -0700
commit3f72ae45a38b40dc0ff718e9cea91f18bb9bb7f0 (patch)
tree8f3f70dc72744b645cc5172f1f2de0c8bfd6797d
parent9282f7095ed61d79d9232f7b2c6f7e838117beca (diff)
Remove do_mkdir and simplify mkdirs
Change-Id: I2e629533bceafb341ced5b1b3f2436448293e03f Signed-off-by: Luis Pabon <lpabon@redhat.com> Reviewed-on: http://review.gluster.org/5304 Reviewed-by: Peter Portante <pportant@redhat.com> Tested-by: Peter Portante <pportant@redhat.com>
-rw-r--r--gluster/swift/common/fs_utils.py30
-rw-r--r--test/unit/common/test_fs_utils.py25
2 files changed, 11 insertions, 44 deletions
diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py
index 4de58e4..1f8415c 100644
--- a/gluster/swift/common/fs_utils.py
+++ b/gluster/swift/common/fs_utils.py
@@ -35,27 +35,6 @@ def do_write(fd, msg):
return cnt
-def do_mkdir(path):
- try:
- os.mkdir(path)
- except OSError as err:
- if err.errno != errno.EEXIST:
- logging.exception("Mkdir failed on %s err: %s", path, err.strerror)
- raise
- return True
-
-
-def do_makedirs(path):
- try:
- os.makedirs(path)
- except OSError as err:
- if err.errno != errno.EEXIST:
- logging.exception("Makedirs failed on %s err: %s",
- path, err.strerror)
- raise
- return True
-
-
def do_listdir(path):
try:
buf = os.listdir(path)
@@ -155,7 +134,14 @@ def mkdirs(path):
:param path: path to create
"""
if not os.path.isdir(path):
- do_makedirs(path)
+ try:
+ os.makedirs(path)
+ except OSError as err:
+ if err.errno != errno.EEXIST:
+ logging.exception("Makedirs failed on %s err: %s",
+ path, err.strerror)
+ raise
+ return True
def dir_empty(path):
diff --git a/test/unit/common/test_fs_utils.py b/test/unit/common/test_fs_utils.py
index b31a9a2..910199e 100644
--- a/test/unit/common/test_fs_utils.py
+++ b/test/unit/common/test_fs_utils.py
@@ -116,32 +116,13 @@ class TestFsUtils(unittest.TestCase):
os.close(fd)
os.remove(tmpfile)
- def test_do_mkdir(self):
- try:
- path = os.path.join('/tmp', str(random.random()))
- fs.do_mkdir(path)
- assert os.path.exists(path)
- assert fs.do_mkdir(path)
- finally:
- os.rmdir(path)
-
- def test_do_mkdir_err(self):
- try:
- path = os.path.join('/tmp', str(random.random()), str(random.random()))
- fs.do_mkdir(path)
- except OSError:
- pass
- else:
- self.fail("OSError expected")
-
-
- def test_do_makedirs(self):
+ def test_mkdirs(self):
try:
subdir = os.path.join('/tmp', str(random.random()))
path = os.path.join(subdir, str(random.random()))
- fs.do_makedirs(path)
+ fs.mkdirs(path)
assert os.path.exists(path)
- assert fs.do_makedirs(path)
+ assert fs.mkdirs(path)
finally:
shutil.rmtree(subdir)