diff options
| author |   Alex Gaynor <alex.gaynor@gmail.com> | 2014-08-20 17:30:42 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-08-20 17:30:42 -0700 |
| commit | 48ca79c3d01fd4b4f2edbaad6afefb31e882ae75 (patch) | |
| tree | daa2e9654e847c3b4524e1c3bf129a459eadef5a /lib-python/conftest.py | |
| parent | branch for stdlib 2.7.8 (diff) | |
| download | pypy-48ca79c3d01fd4b4f2edbaad6afefb31e882ae75.tar.gz pypy-48ca79c3d01fd4b4f2edbaad6afefb31e882ae75.tar.bz2 pypy-48ca79c3d01fd4b4f2edbaad6afefb31e882ae75.zip | |
Added two missing files to the lib-python conftest, also delete some deadcode
Diffstat (limited to 'lib-python/conftest.py')
| -rw-r--r-- | lib-python/conftest.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib-python/conftest.py b/lib-python/conftest.py index c0d6551c92..4295ffcfcf 100644 --- a/lib-python/conftest.py +++ b/lib-python/conftest.py @@ -265,6 +265,7 @@ testmap = [ RegrTest('test_imageop.py'), RegrTest('test_imaplib.py'), RegrTest('test_imgfile.py'), + RegrTest('test_imghdr.py'), RegrTest('test_imp.py', core=True, usemodules='thread'), RegrTest('test_import.py', core=True), RegrTest('test_importhooks.py', core=True), @@ -397,6 +398,7 @@ testmap = [ RegrTest('test_socketserver.py', usemodules='thread'), RegrTest('test_softspace.py', core=True), RegrTest('test_sort.py', core=True), + RegrTest('test_spwd.py'), RegrTest('test_sqlite.py', usemodules="thread _rawffi zlib"), RegrTest('test_ssl.py', usemodules='_ssl _socket select'), RegrTest('test_startfile.py'), @@ -543,8 +545,6 @@ class RunFileExternal(py.test.collect.File): # invoking in a separate process: py.py TESTFILE # import os -import time -import getpass class ReallyRunFileExternal(py.test.collect.Item): class ExternalFailure(Exception): @@ -663,17 +663,11 @@ class ReallyRunFileExternal(py.test.collect.Item): timedout = test_stderr.rfind("KeyboardInterrupt") != -1 if test_stderr.rfind(26*"=" + "skipped" + 26*"=") != -1: skipped = True - outcome = 'OK' if not exit_status: # match "FAIL" but not e.g. "FAILURE", which is in the output of a # test in test_zipimport_support.py if re.search(r'\bFAIL\b', test_stdout) or re.search('[^:]ERROR', test_stderr): - outcome = 'FAIL' exit_status = 2 - elif timedout: - outcome = "T/O" - else: - outcome = "ERR" return skipped, exit_status, test_stdout, test_stderr |