summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiddharth Ravikumar <sravik@bgsu.edu>2015-03-04 20:32:45 -0500
committerSiddharth Ravikumar <sravik@bgsu.edu>2015-03-04 20:32:45 -0500
commit7c612e9520aa7d1c41e0aa9eafc0cf00cebb7180 (patch)
tree886cc3859ff97e8e565c698ffcb56e42089aba95
parentc5722f75454eb42ac9fe5cda79fb25f839c3092c (diff)
new function combox.file.rm_dir
also wrote test for it. modified: combox/file.py modified: tests/file_test.py
-rw-r--r--combox/file.py8
-rw-r--r--tests/file_test.py10
2 files changed, 18 insertions, 0 deletions
diff --git a/combox/file.py b/combox/file.py
index d7602e9..43ce5af 100644
--- a/combox/file.py
+++ b/combox/file.py
@@ -129,6 +129,14 @@ def rm_nodedir(directory, config):
print e, "Something wrong. report bug to sravik@bgsu.edu"
+def rm_dir(directory):
+ """Removes directory"""
+ try:
+ os.rmdir(directory)
+ except OSError, e:
+ print e, "Something wrong. report bug to sravik@bgsu.edu"
+
+
def move_nodedir(src, dest, config):
"""
Moves directory `directory' inside the nodes from old to new location.
diff --git a/tests/file_test.py b/tests/file_test.py
index 7c041b7..b740704 100644
--- a/tests/file_test.py
+++ b/tests/file_test.py
@@ -150,6 +150,16 @@ class TestFile(object):
assert foo_nodedir == node_path(foo_dir, self.config)
+ def test_rmdir(self):
+ """Tests rm_dir function"""
+ new_dir = path.join(self.config['combox_dir'], 'fooius')
+ os.mkdir(new_dir)
+ assert path.isdir(new_dir)
+
+ rm_dir(new_dir)
+ assert not path.isdir(new_dir)
+
+
@classmethod
def teardown_class(self):
"""Purge the mess created by this test."""