diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2010-12-08 04:03:30 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2010-12-08 04:03:30 +0000 |
| commit | 1c81377af583029d014a85db62c7e78d8b924e4e (patch) | |
| tree | 5c837a736b58ae891bcf3a60f670cea149becfd4 /tests/regressiontests | |
| parent | 7c23fbd9a0cb0f41abcf4a75a4708dc140f99ace (diff) | |
[1.2.X] Ensure that a Popen object is closed promptly during the tests. Backport [14853].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index da57579eb2..2a7f3023c1 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -119,6 +119,7 @@ class AdminScriptTestCase(unittest.TestCase): 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) + p.wait() except ImportError: stdin, stdout, stderr = os.popen3(cmd) out, err = stdout.read(), stderr.read() |