X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_remove_old_files.py;h=645362a14dbfa2e74f870f0ef5d76c367d99e7fc;hb=1c8100c4383ad47d1e1f88e8b92d1ddb371eff8f;hp=ea36506dd4d4198acc97dd31abd7e8fae64581a6;hpb=50c0b081758c4a611583b53b61a70b3b7b791223;p=ppu.git

diff --git a/tests/test_remove_old_files.py b/tests/test_remove_old_files.py
index ea36506..645362a 100755
--- a/tests/test_remove_old_files.py
+++ b/tests/test_remove_old_files.py
@@ -2,57 +2,16 @@
 
 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
-old_time = time() - 1000 * 24 * 3600  # 1000 days ago
-
-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:
-    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)
+test_prog_path = find_in_path('remove-old-files.py')
 
 
-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():
@@ -78,6 +37,11 @@ def test_recursive():
 
 
 def test_remove_empty_directory():
+    teardown()
+    try:
+        setup()
+    except OSError:
+        pass
     create_files(['test3', 'test4'], 'subdir')
     test3 = os.path.join('subdir', 'test3')
     test4 = os.path.join('subdir', 'test4')