From cb04061570c08b405e4369399b03bfd550c299f0 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 19 Mar 2017 20:20:10 +0200
Subject: [PATCH 1/2] bpo-29845: Mark tests that use _testcapi as CPython-only
 (#711)

(cherry picked from commit 24c738a9e91b8f46da6166663d8ce7ec18cec784)
---
 Lib/ctypes/test/test_structures.py | 5 ++++-
 Lib/test/test_atexit.py            | 1 +
 Lib/test/test_coroutines.py        | 1 +
 Lib/test/test_socket.py            | 1 +
 Lib/test/test_tracemalloc.py       | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py
index 0b9391a4dbb5a76..2e9fc7c49cc4998 100644
--- a/Lib/ctypes/test/test_structures.py
+++ b/Lib/ctypes/test/test_structures.py
@@ -2,8 +2,8 @@
 from ctypes import *
 from ctypes.test import need_symbol
 from struct import calcsize
-import _testcapi
 import _ctypes_test
+import test.support
 
 class SubclassesTest(unittest.TestCase):
     def test_subclass(self):
@@ -202,7 +202,10 @@ class X(Structure):
              "_pack_": -1}
         self.assertRaises(ValueError, type(Structure), "X", (Structure,), d)
 
+    @test.support.cpython_only
+    def test_packed_c_limits(self):
         # Issue 15989
+        import _testcapi
         d = {"_fields_": [("a", c_byte)],
              "_pack_": _testcapi.INT_MAX + 1}
         self.assertRaises(ValueError, type(Structure), "X", (Structure,), d)
diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index 172bd25419cea73..c761076c4a0225a 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -143,6 +143,7 @@ def test_bound_methods(self):
         self.assertEqual(l, [5])
 
 
+@support.cpython_only
 class SubinterpreterTest(unittest.TestCase):
 
     def test_callbacks_leak(self):
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 6d63cdb5f0fcc92..402fbe845765e51 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -1772,6 +1772,7 @@ def wrap(gen):
             sys.set_coroutine_wrapper(None)
 
 
+@support.cpython_only
 class CAPITest(unittest.TestCase):
 
     def test_tp_await_1(self):
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 70c03f9c468a215..b72fc8fbf0cadd3 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -876,6 +876,7 @@ def testNtoH(self):
             self.assertEqual(swapped & mask, mask)
             self.assertRaises(OverflowError, func, 1<<34)
 
+    @support.cpython_only
     def testNtoHErrors(self):
         good_values = [ 1, 2, 3, 1, 2, 3 ]
         bad_values = [ -1, -2, -3, -1, -2, -3 ]
diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py
index da89a9a87159358..ec5a24f3015e61d 100644
--- a/Lib/test/test_tracemalloc.py
+++ b/Lib/test/test_tracemalloc.py
@@ -809,6 +809,7 @@ def test_sys_xoptions_invalid(self):
                                   b'number of frames',
                                   stderr)
 
+    @unittest.skipIf(_testcapi is None, 'need _testcapi')
     def test_pymem_alloc0(self):
         # Issue #21639: Check that PyMem_Malloc(0) with tracemalloc enabled
         # does not crash.

From f25f6811cdfe7f46efc2058e78284007f2af31b0 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 19 Mar 2017 21:05:00 +0200
Subject: [PATCH 2/2] Fixed test_tracemalloc.

---
 Lib/test/test_tracemalloc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py
index ec5a24f3015e61d..2d1a9b3cfb20af7 100644
--- a/Lib/test/test_tracemalloc.py
+++ b/Lib/test/test_tracemalloc.py
@@ -809,7 +809,7 @@ def test_sys_xoptions_invalid(self):
                                   b'number of frames',
                                   stderr)
 
-    @unittest.skipIf(_testcapi is None, 'need _testcapi')
+    @support.cpython_only
     def test_pymem_alloc0(self):
         # Issue #21639: Check that PyMem_Malloc(0) with tracemalloc enabled
         # does not crash.