[Python-checkins] cpython (merge 3.6 -> default): Merge test suite fixes from 3.6

Thu Oct 20 19:08:56 EDT 2016

https://hg.python.org/cpython/rev/091019c5e1fd
changeset: 104596:091019c5e1fd
parent: 104593:74eb9c51d64e
parent: 104595:b811ec148337
user: Martin Panter <vadmium+py at gmail.com>
date: Thu Oct 20 22:36:18 2016 +0000
summary:
 Merge test suite fixes from 3.6
files:
 Lib/test/test_capi.py | 1 +
 Lib/test/test_regrtest.py | 7 ++++++-
 Lib/test/test_socket.py | 1 +
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -630,6 +630,7 @@
 regex = regex.format(ptr=self.PTR_REGEX)
 self.assertRegex(out, regex)
 
+ @unittest.skipUnless(threading, 'Test requires a GIL (multithreading)')
 def check_malloc_without_gil(self, code):
 out = self.check(code)
 expected = ('Fatal Python error: Python memory allocator called '
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -696,7 +696,12 @@
 code = TEST_INTERRUPTED
 test = self.create_test("sigint", code=code)
 
- for multiprocessing in (False, True):
+ try:
+ import threading
+ tests = (False, True)
+ except ImportError:
+ tests = (False,)
+ for multiprocessing in tests:
 if multiprocessing:
 args = ("--slowest", "-j2", test)
 else:
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4569,6 +4569,7 @@
 sock = socket.socket(
 socket.AF_INET, socket.SOCK_STREAM, 0, sock0.fileno())
 sock0.close()
+ self.addCleanup(sock.detach)
 
 with self.assertRaises(OSError):
 sock.setblocking(False)
-- 
Repository URL: https://hg.python.org/cpython
