X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_remove_old_files.py;h=dce091d7334b3fe3a0bc261faeeec4c70bfffd7a;hb=96bc9c67fc993dc918ea80c208096b9523a68f6f;hp=e50b6fad711e5dbe2642b5b4c6f28c028da978d6;hpb=f753377d712c7af64ae840d82923d566b2c7bc8c;p=ppu.git

diff --git a/tests/test_remove_old_files.py b/tests/test_remove_old_files.py
index e50b6fa..dce091d 100755
--- a/tests/test_remove_old_files.py
+++ b/tests/test_remove_old_files.py
@@ -1,53 +1,25 @@
 #! /usr/bin/env python
 
-import shutil
+from time import time
 import os
-from tempfile import mkdtemp
+import subprocess
+import sys
+from ppu_tu import setup, teardown, find_in_path  # noqa
+from ppu_tu import create_files, assert_files_exist, assert_files_not_exist
 
 
-tmp_dir = None
+test_prog_path = find_in_path('remove-old-files.py')
 
 
-def setup():
-    global tmp_dir
-    tmp_dir = mkdtemp()
-    os.chdir(tmp_dir)
-
-
-def teardown():
-    os.chdir(os.sep)  # To the root of the FS
-    shutil.rmtree(tmp_dir)
-
-
-def create_files(files, subdirectory=None):
-    if subdirectory:
-        os.makedirs(subdirectory)
-    else:
-        subdirectory = ''
-    for fname in files:
-        with open(os.path.join(subdirectory, fname), 'w'):
-            pass
-
-
-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)
+old_time = time() - 1000 * 24 * 3600  # 1000 days ago
 
 
 def test_remove_old_files():
     create_files(['test1', 'test2'])
     assert_files_exist(['test1', 'test2'])
-    os.utime('test2', (0, 0))
-    assert os.system("remove-old-files.py --older 100 .") == 0
+    os.utime('test2', (old_time, old_time))
+    assert subprocess.call(
+        [sys.executable, test_prog_path, "--older", "100", "."]) == 0
     assert_files_exist('test1')
     assert_files_not_exist('test2')
 
@@ -57,7 +29,24 @@ def test_recursive():
     test3 = os.path.join('subdir', 'test3')
     test4 = os.path.join('subdir', 'test4')
     assert_files_exist([test3, test4])
-    os.utime(test4, (0, 0))
-    assert os.system("remove-old-files.py --older 100 .") == 0
+    os.utime(test4, (old_time, old_time))
+    assert subprocess.call(
+        [sys.executable, test_prog_path, "--older", "100", "."]) == 0
     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, (old_time, old_time))
+    os.utime(test4, (old_time, old_time))
+    assert subprocess.call(
+        [sys.executable, test_prog_path, "--older", "100", "."]) == 0
+    assert_files_exist('subdir')
+    assert_files_not_exist([test3, test4])
+    assert subprocess.call(
+        [sys.executable, test_prog_path, "-e", "--older", "100", "."]) == 0
+    assert_files_not_exist('subdir')