X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_remove_old_files.py;h=80c91e4e05e9fb375249a16cdbf84ef06264beb2;hb=1aaa1a75e6c4ec88d7a403f9f0460de727ff38d8;hp=87fc3e319bdb60e5ad8a9937ec3bbd102ab97d72;hpb=dd127f84569ceebec6243a16c3bb9e4130493a6b;p=ppu.git

diff --git a/tests/test_remove_old_files.py b/tests/test_remove_old_files.py
index 87fc3e3..80c91e4 100755
--- a/tests/test_remove_old_files.py
+++ b/tests/test_remove_old_files.py
@@ -1,62 +1,27 @@
 #! /usr/bin/env python
 
+from time import time
 import os
-import shutil
+import subprocess
 import sys
-from tempfile import mkdtemp
+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
-for path in os.environ["PATH"].split(os.pathsep):
-    path = path.strip('"')
-    test_prog_path = os.path.join(path, 'remove-old-files.py')
-    if os.path.exists(test_prog_path):
-        break
-else:
+test_prog_path = find_in_path('remove-old-files.py')
+if not test_prog_path:
     sys.exit("Cannot find remove-old-files.py in %s" % os.environ["PATH"])
 
 
-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(
-        "%s %s --older 100 ." % (sys.executable, test_prog_path)) == 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')
 
@@ -66,9 +31,9 @@ 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(
-        "%s %s --older 100 ." % (sys.executable, test_prog_path)) == 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)
 
@@ -78,12 +43,12 @@ def test_remove_empty_directory():
     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(
-        "%s %s --older 100 ." % (sys.executable, test_prog_path)) == 0
+    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 os.system(
-        "%s %s -e --older 100 ." % (sys.executable, test_prog_path)) == 0
+    assert subprocess.call(
+        [sys.executable, test_prog_path, "-e", "--older", "100", "."]) == 0
     assert_files_not_exist('subdir')