Author: Alex Gaynor <[email protected]>
Branch: stdlib-2.7.8
Changeset: r72944:7d5bcaa33e27
Date: 2014-08-20 17:30 -0700
http://bitbucket.org/pypy/pypy/changeset/7d5bcaa33e27/
Log: Added two missing files to the lib-python conftest, also delete some
deadcode
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -265,6 +265,7 @@
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 @@
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 @@
# 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 @@
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
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
