[pypy-svn] r58367 - in pypy/build/testrunner: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Sep 23 11:43:34 2008
New Revision: 58367

Modified:
   pypy/build/testrunner/runner.py
   pypy/build/testrunner/test/test_runner.py
Log:
(iko, pedronis)

- missing relto
- adjusting tests



Modified: pypy/build/testrunner/runner.py
==============================================================================
--- pypy/build/testrunner/runner.py	(original)
+++ pypy/build/testrunner/runner.py	Tue Sep 23 11:43:34 2008
@@ -163,7 +163,7 @@
             for p1 in entries:
                 if self.is_test_py_file(p1):
                     self.collect_one_testdir(testdirs, reldir,
-                                   [t for t in entries
+                                   [t.relto(self.root) for t in entries
                                     if self.is_test_py_file(t)])
                     return
 

Modified: pypy/build/testrunner/test/test_runner.py
==============================================================================
--- pypy/build/testrunner/test/test_runner.py	(original)
+++ pypy/build/testrunner/test/test_runner.py	Tue Sep 23 11:43:34 2008
@@ -105,21 +105,6 @@
     def teardown_class(cls):
         runner.invoke_in_thread = cls.real_invoke_in_thread[0]
 
-    def test_collect_testdirs(self):
-        res = []
-        run_param = runner.RunParam(self.one_test_dir)
-        
-        run_param.collect_testdirs(res)
-
-        assert res == ['test_normal']
-
-        res = []
-        run_param = runner.RunParam(self.two_test_dir)
-        
-        run_param.collect_testdirs(res)
-
-        assert sorted(res) == ['pkg/test_normal2', 'test_normal1']        
-
     def test_one_dir(self):
         test_driver = [py.path.local(py.__file__).dirpath('bin', 'py.test')]
 
@@ -210,6 +195,35 @@
 class TestRunnerNoThreads(RunnerTests):
     with_thread = False
 
+    def test_collect_testdirs(self):
+        res = []
+        seen = []
+        run_param = runner.RunParam(self.one_test_dir)
+        real_collect_one_testdir = run_param.collect_one_testdir
+
+        def witness_collect_one_testdir(testdirs, reldir, tests):
+            seen.append((reldir, sorted(map(str, tests))))
+            real_collect_one_testdir(testdirs, reldir, tests)
+
+        run_param.collect_one_testdir = witness_collect_one_testdir
+        
+        run_param.collect_testdirs(res)
+
+        assert res == ['test_normal']
+        assert len(seen) == 1
+        reldir, tests = seen[0]
+        assert reldir == 'test_normal'
+        for test in tests:
+            assert test.startswith('test_normal/')
+
+        run_param.collect_one_testdir = real_collect_one_testdir
+        res = []
+        run_param = runner.RunParam(self.two_test_dir)
+        
+        run_param.collect_testdirs(res)
+
+        assert sorted(res) == ['pkg/test_normal2', 'test_normal1']        
+
 
 class TestRunner(RunnerTests):
     pass