diff options
Diffstat (limited to 'tests/regressiontests/admin_scripts/tests.py')
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 3cbcb1cf92..33c960dcbb 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -106,7 +106,12 @@ class AdminScriptTestCase(unittest.TestCase): # Move to the test directory and run os.chdir(test_dir) - stdin, stdout, stderr = os.popen3(cmd) + try: + from subprocess import Popen, PIPE + p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) + stdin, stdout, stderr = (p.stdin, p.stdout, p.stderr) + except ImportError: + stdin, stdout, stderr = os.popen3(cmd) out, err = stdout.read(), stderr.read() # Restore the old environment |