[pypy-svn] r69132 - pypy/build/testrunner/test

hpk at codespeak.net hpk at codespeak.net
Tue Nov 10 19:02:22 CET 2009


Author: hpk
Date: Tue Nov 10 19:02:22 2009
New Revision: 69132

Modified:
   pypy/build/testrunner/test/test_runner.py
Log:
fix a better location for pytest script


Modified: pypy/build/testrunner/test/test_runner.py
==============================================================================
--- pypy/build/testrunner/test/test_runner.py	(original)
+++ pypy/build/testrunner/test/test_runner.py	Tue Nov 10 19:02:22 2009
@@ -1,7 +1,9 @@
 import py, sys, os, signal, cStringIO, tempfile
 
 import runner
+import pypy
 
+pytest_script = py.path.local(pypy.__file__).dirpath('test_all.py')
 
 class TestRunHelper(object):
 
@@ -158,7 +160,7 @@
         runner.invoke_in_thread = cls.real_invoke_in_thread[0]
 
     def test_one_dir(self):
-        test_driver = [py.path.local(py.__file__).dirpath('bin', 'py.test')]
+        test_driver = [pytest_script]
 
         log = cStringIO.StringIO()
         out = cStringIO.StringIO()
@@ -194,7 +196,7 @@
         assert nfailures == 6
 
     def test_one_dir_dry_run(self):
-        test_driver = [py.path.local(py.__file__).dirpath('bin', 'py.test')]
+        test_driver = [pytest_script]
 
         log = cStringIO.StringIO()
         out = cStringIO.StringIO()
@@ -220,7 +222,7 @@
             assert "test_normal" in line
 
     def test_many_dirs(self):
-        test_driver = [py.path.local(py.__file__).dirpath('bin', 'py.test')]
+        test_driver = [pytest_script]
 
         log = cStringIO.StringIO()
         out = cStringIO.StringIO()
@@ -260,7 +262,7 @@
         assert set(cleanedup) == set(alltestdirs)
 
     def test_timeout(self):
-        test_driver = [py.path.local(py.__file__).dirpath('bin', 'py.test')]
+        test_driver = [pytest_script]
 
         log = cStringIO.StringIO()
         out = cStringIO.StringIO()
@@ -295,7 +297,7 @@
         assert log_lines[1] == ' Failed to run interp'
 
     def test_run_bad_get_test_driver(self):
-        test_driver = [py.path.local(py.__file__).dirpath('bin', 'py.test')]
+        test_driver = [pytest_script]
         
         log = cStringIO.StringIO()
         out = cStringIO.StringIO()



More information about the Pypy-commit mailing list