Win32 portability in runtest.py tests after disabling QMTest by default.

4 files changed, 13 insertions, 13 deletions

diff --git a/test/runtest/simple/combined.py b/test/runtest/simple/combined.py
index 6794ea5..6817820 100644
--- a/test/runtest/simple/combined.py
+++ b/test/runtest/simple/combined.py
@@ -30,13 +30,13 @@ Test a combination of a passing test, failing test, and no-result
 test with no argument on the command line.
 """
 
-import os.path
+import os
 
 import TestRuntest
 
 test = TestRuntest.TestRuntest()
 
-python = TestRuntest.python
+pythonstring = TestRuntest.pythonstring
 test_fail_py = os.path.join('test', 'fail.py')
 test_no_result_py = os.path.join('test', 'no_result.py')
 test_pass_py = os.path.join('test', 'pass.py')
@@ -50,18 +50,18 @@ test.write_no_result_test(['test', 'no_result.py'])
 test.write_passing_test(['test', 'pass.py'])
 
 expect_stdout = """\
-%(python)s -tt test/fail.py
+%(pythonstring)s -tt %(test_fail_py)s
 FAILING TEST STDOUT
-%(python)s -tt test/no_result.py
+%(pythonstring)s -tt %(test_no_result_py)s
 NO RESULT TEST STDOUT
-%(python)s -tt test/pass.py
+%(pythonstring)s -tt %(test_pass_py)s
 PASSING TEST STDOUT
 
 Failed the following test:
-\ttest/fail.py
+\t%(test_fail_py)s
 
 NO RESULT from the following test:
-\ttest/no_result.py
+\t%(test_no_result_py)s
 """ % locals()
 
 expect_stderr = """\
diff --git a/test/runtest/simple/fail.py b/test/runtest/simple/fail.py
index 4a36c47..36ec0d0 100644
--- a/test/runtest/simple/fail.py
+++ b/test/runtest/simple/fail.py
@@ -30,7 +30,7 @@ Test how we handle a failing test specified on the command line.
 
 import TestRuntest
 
-python = TestRuntest.python
+pythonstring = TestRuntest.pythonstring
 
 test = TestRuntest.TestRuntest()
 
@@ -39,7 +39,7 @@ test.subdir('test')
 test.write_failing_test(['test', 'fail.py'])
 
 expect_stdout = """\
-%(python)s -tt test/fail.py
+%(pythonstring)s -tt test/fail.py
 FAILING TEST STDOUT
 """ % locals()
 
diff --git a/test/runtest/simple/no_result.py b/test/runtest/simple/no_result.py
index 475c5a8..97dcede 100644
--- a/test/runtest/simple/no_result.py
+++ b/test/runtest/simple/no_result.py
@@ -30,7 +30,7 @@ Test how we handle a no-results test specified on the command line.
 
 import TestRuntest
 
-python = TestRuntest.python
+pythonstring = TestRuntest.pythonstring
 
 test = TestRuntest.TestRuntest()
 
@@ -39,7 +39,7 @@ test.subdir('test')
 test.write_no_result_test(['test', 'no_result.py'])
 
 expect_stdout = """\
-%(python)s -tt test/no_result.py
+%(pythonstring)s -tt test/no_result.py
 NO RESULT TEST STDOUT
 """ % locals()
 
diff --git a/test/runtest/simple/pass.py b/test/runtest/simple/pass.py
index 873be09..6332e5f 100644
--- a/test/runtest/simple/pass.py
+++ b/test/runtest/simple/pass.py
@@ -30,7 +30,7 @@ Test how we handle a passing test specified on the command line.
 
 import TestRuntest
 
-python = TestRuntest.python
+pythonstring = TestRuntest.pythonstring
 
 test = TestRuntest.TestRuntest()
 
@@ -39,7 +39,7 @@ test.subdir('test')
 test.write_passing_test(['test', 'pass.py'])
 
 expect_stdout = """\
-%(python)s -tt test/pass.py
+%(pythonstring)s -tt test/pass.py
 PASSING TEST STDOUT
 """ % locals()