Use subprocess.call() instead of os.system()

[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..99c90343be73a4ccd4de95082022dcf13d763f35 100755 (executable)
--- a/tests/test_remove_old_files.py
+++ b/tests/test_remove_old_files.py
@@ -1,11 +1,20 @@
 #! /usr/bin/env python
 
-import shutil
 import os
+import shutil
+import subprocess
+import sys
 from tempfile import mkdtemp
 
 
 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:
+    sys.exit("Cannot find remove-old-files.py in %s" % os.environ["PATH"])
 
 
 def setup():
@@ -30,11 +39,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)
 
@@ -43,9 +56,10 @@ 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
-    assert_files_exist(['test1'])
-    assert_files_not_exist(['test2'])
+    assert subprocess.call(
+        [sys.executable, test_prog_path, "--older", "100", "."]) == 0
+    assert_files_exist('test1')
+    assert_files_not_exist('test2')
 
 
 def test_recursive():
@@ -54,6 +68,23 @@ def test_recursive():
     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
-    assert_files_exist([test3])
-    assert_files_not_exist([test4])
+    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, (0, 0))
+    os.utime(test4, (0, 0))
+    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')