Remove empty directories

[ppu.git] / tests / test_remove_old_files.py

diff --git a/tests/test_remove_old_files.py b/tests/test_remove_old_files.py
index 7c0c3c3ebd2050de46e444cb7e9b26c08b50a8db..67da601952463f0c5379af8614b0b371aa7332f7 100755 (executable)
--- a/tests/test_remove_old_files.py
+++ b/tests/test_remove_old_files.py
@@ -30,11 +30,15 @@ def create_files(files, subdirectory=None):
 
 
 def assert_files_exist(files):
+    if isinstance(files, str):
+        files = [files]
     for fname in files:
         assert os.path.exists(fname)
 
 
 def assert_files_not_exist(files):
+    if isinstance(files, str):
+        files = [files]
     for fname in files:
         assert not os.path.exists(fname)
 
@@ -44,8 +48,8 @@ def test_remove_old_files():
     assert_files_exist(['test1', 'test2'])
     os.utime('test2', (0, 0))
     assert os.system("remove-old-files.py --older 100 .") == 0
-    assert_files_exist(['test1'])
-    assert_files_not_exist(['test2'])
+    assert_files_exist('test1')
+    assert_files_not_exist('test2')
 
 
 def test_recursive():
@@ -55,5 +59,19 @@ def test_recursive():
     assert_files_exist([test3, test4])
     os.utime(test4, (0, 0))
     assert os.system("remove-old-files.py --older 100 .") == 0
-    assert_files_exist([test3])
-    assert_files_not_exist([test4])
+    assert_files_exist(test3)
+    assert_files_not_exist(test4)
+
+
+def test_remove_empty_directory():
+    create_files(['test3', 'test4'], 'subdir')
+    test3 = os.path.join('subdir', 'test3')
+    test4 = os.path.join('subdir', 'test4')
+    assert_files_exist([test3, test4])
+    os.utime(test3, (0, 0))
+    os.utime(test4, (0, 0))
+    assert os.system("remove-old-files.py --older 100 .") == 0
+    assert_files_exist('subdir')
+    assert_files_not_exist([test3, test4])
+    assert os.system("remove-old-files.py -e --older 100 .") == 0
+    assert_files_not_exist('subdir')