Refactor tests: allow assert_files(one_file_name)

[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 6f615ba0d57331eaba41cfa3b9528fc3c2802771..e50b6fad711e5dbe2642b5b4c6f28c028da978d6 100755 (executable)
--- a/tests/test_remove_old_files.py
+++ b/tests/test_remove_old_files.py
@@ -29,31 +29,35 @@ def create_files(files, subdirectory=None):
             pass
 
 
-def _test_files_exist(files):
+def assert_files_exist(files):
+    if isinstance(files, str):
+        files = [files]
     for fname in files:
         assert os.path.exists(fname)
 
 
-def _test_files_not_exist(files):
+def assert_files_not_exist(files):
+    if isinstance(files, str):
+        files = [files]
     for fname in files:
         assert not os.path.exists(fname)
 
 
 def test_remove_old_files():
     create_files(['test1', 'test2'])
-    _test_files_exist(['test1', 'test2'])
+    assert_files_exist(['test1', 'test2'])
     os.utime('test2', (0, 0))
     assert os.system("remove-old-files.py --older 100 .") == 0
-    _test_files_exist(['test1'])
-    _test_files_not_exist(['test2'])
+    assert_files_exist('test1')
+    assert_files_not_exist('test2')
 
 
 def test_recursive():
     create_files(['test3', 'test4'], 'subdir')
     test3 = os.path.join('subdir', 'test3')
     test4 = os.path.join('subdir', 'test4')
-    _test_files_exist([test3, test4])
+    assert_files_exist([test3, test4])
     os.utime(test4, (0, 0))
     assert os.system("remove-old-files.py --older 100 .") == 0
-    _test_files_exist([test3])
-    _test_files_not_exist([test4])
+    assert_files_exist(test3)
+    assert_files_not_exist(test4)