Change CoverageTestRunner.py to run stuff only in named dirs.

6 files changed, 19 insertions, 9 deletions

diff --git a/CoverageTestRunner.py b/CoverageTestRunner.py
index c741418..a54e3b0 100644
--- a/CoverageTestRunner.py
+++ b/CoverageTestRunner.py
@@ -238,7 +238,7 @@ class CoverageTestRunner:
         return result
 
 
-def run(dirname="."):
+def run():
     """Use CoverageTestRunner on the desired directory."""
 
     parser = optparse.OptionParser()
@@ -252,7 +252,10 @@ def run(dirname="."):
                       help="Ignore missing test modules for modules listed "
                            "in FILE.")
 
-    opts, args = parser.parse_args()
+    opts, dirnames = parser.parse_args()
+    if not dirnames:
+        dirnames = ['.']
+    dirname = dirnames[0]
     
     if opts.ignore_missing_from:
         lines = file(opts.ignore_missing_from).readlines()
diff --git a/Makefile b/Makefile
index f39d72d..8dcfae0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,3 +16,7 @@ all:
 clean:
 	rm -f *.py[co] */*.py[co] .coverage
 	rm -rf build
+	
+check:
+	./testrun
+	rm -f .coverage
diff --git a/subdir/foo.py b/subdir/foo.py
index 6711dd4..711ab4d 100644
--- a/subdir/foo.py
+++ b/subdir/foo.py
@@ -3,8 +3,11 @@ class Foo:
     def foo(self, a):
         if a:
             return True
+        elif False: # pragma: no cover
+            return None # pragma: no cover
         else:
             import time
             time.sleep(0)
             return False
-            pass # pragma: no cover
+
+foo = Foo()
diff --git a/test-excluded b/test-excluded
index 4123000..2835413 100644
--- a/test-excluded
+++ b/test-excluded
@@ -1,2 +1,2 @@
-./subdir/bar.py
+subdir/bar.py
 
diff --git a/testrun b/testrun
new file mode 100755
index 0000000..bf89868
--- /dev/null
+++ b/testrun
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+python CoverageTestRunner.py subdir --ignore-missing-from=test-excluded
diff --git a/testrun.py b/testrun.py
deleted file mode 100644
index 166ce01..0000000
--- a/testrun.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from CoverageTestRunner import CoverageTestRunner
-
-r = CoverageTestRunner()
-r.find_pairs(".", [])
-r.run()