[pypy-commit] pypy refine-testrunner: testrunner: move win32 handling from execute_test to execute_args

[RonnyPfannschmidt]

Author: Ronny Pfannschmidt <Ronny.Pfannschmidt at gmx.de>
Branch: refine-testrunner
Changeset: r55883:6e71295270ef
Date: 2012-07-01 16:41 +0200
http://bitbucket.org/pypy/pypy/changeset/6e71295270ef/

Log:	testrunner: move win32 handling from execute_test to execute_args

diff --git a/testrunner/runner.py b/testrunner/runner.py
--- a/testrunner/runner.py
+++ b/testrunner/runner.py
@@ -9,7 +9,8 @@
 WRITE_MODE = 'wb'
 
 
-def execute_args(test, logfname, interp, test_driver):
+def execute_args(cwd, test, logfname, interp, test_driver,
+                 _win32=(sys.platform=='win32')):
     args = interp + test_driver
     args += ['-p', 'resultlog',
              '--resultlog=%s' % logfname,
@@ -17,23 +18,20 @@
              test]
 
     args = map(str, args)
-    return args
-
-
-
-def execute_test(cwd, test, out, logfname, interp, test_driver,
-                 runfunc, timeout=None,
-                 _win32=(sys.platform=='win32')):
-    args = execute_args(test, logfname, interp, test_driver)
 
     interp0 = args[0]
     if (_win32 and not os.path.isabs(interp0) and
         ('\\' in interp0 or '/' in interp0)):
         args[0] = os.path.join(str(cwd), interp0)
 
-    
+
+    return args
+
+
+def execute_test(cwd, test, out, logfname, interp, test_driver,
+                 runfunc, timeout=None):
+    args = execute_args(cwd, test, logfname, interp, test_driver)
     exitcode = runfunc(args, cwd, out, timeout=timeout)
-    
     return exitcode
 
 
@@ -214,7 +212,7 @@
         pass
 
 
-def main(args):
+def main(args, RunParam=RunParam):
     parser = optparse.OptionParser()
     parser.add_option("--logfile", dest="logfile", default=None,
                       help="accumulated machine-readable logfile")
diff --git a/testrunner/test/test_runner.py b/testrunner/test/test_runner.py
--- a/testrunner/test/test_runner.py
+++ b/testrunner/test/test_runner.py
@@ -42,11 +42,9 @@
         assert res == 0
 
     def test_explicit_win32(self, fakerun):
-        res = runner.execute_test('/wd', 'test_one', 'out', 'LOGFILE',
-                                  runfunc=fakerun,
+        args = runner.execute_args('/wd', 'test_one', 'LOGFILE',
                                   interp=['./INTERP', 'IARG'],
                                   test_driver=['driver', 'darg'],
-                                  timeout='secs',
                                   _win32=True
                                   )
 
@@ -56,9 +54,7 @@
                     '--resultlog=LOGFILE',
                     '--junitxml=LOGFILE.junit',
                     'test_one']
-        assert fakerun.called[0] == expected
-        assert fakerun.called == (expected, '/wd', 'out', 'secs') 
-        assert res == 0
+        assert args == expected
 
     def test_error(self, fakerun):
         fakerun.exitcode = 1