Have script_helper._assert_python strip refcount strings from stderr.

This makes the output of the function and those that depend on it
independent of whether or not they are being run under a debug
build.
This commit is contained in:
R. David Murray 2010-12-08 22:53:00 +00:00
parent 53a9dd776e
commit 1b2bd3b348
1 changed files with 3 additions and 1 deletions

View File

@ -3,6 +3,7 @@
import sys import sys
import os import os
import re
import os.path import os.path
import tempfile import tempfile
import subprocess import subprocess
@ -12,7 +13,7 @@ import shutil
import zipfile import zipfile
from imp import source_from_cache from imp import source_from_cache
from test.support import make_legacy_pyc from test.support import make_legacy_pyc, strip_python_stderr
# Executing the interpreter in a subprocess # Executing the interpreter in a subprocess
def _assert_python(expected_success, *args, **env_vars): def _assert_python(expected_success, *args, **env_vars):
@ -34,6 +35,7 @@ def _assert_python(expected_success, *args, **env_vars):
p.stdout.close() p.stdout.close()
p.stderr.close() p.stderr.close()
rc = p.returncode rc = p.returncode
err = strip_python_stderr(err)
if (rc and expected_success) or (not rc and not expected_success): if (rc and expected_success) or (not rc and not expected_success):
raise AssertionError( raise AssertionError(
"Process return code is %d, " "Process return code is %d, "