From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 13 Feb 2010 18:37:34 +0000 (+0000)
Subject: Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed... 
X-Git-Tag: v3.2a1~1696
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb13fbf92a5b087805da723449596574b978cd9f;p=python

Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed in r78172.
---

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 5631d5a037..38243880f7 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1771,21 +1771,6 @@ test_capsule(PyObject *self, PyObject *args)
 	if (error) {
 		return raiseTestError("test_capsule", error);
 	}
-	/* 13/12/2009: something is causing test_capi to fail occasionally on
-	   the Solaris buildbot, with the output:
-
-		internal test_L_code
-		internal test_Z_code
-		internal test_bug_7414
-		internal test_capsule
-		XXX undetected error
-		internaltest test_capi crashed -- <class 'ImportError'>: No module named datetime
-
-	   It seems possible that test_capsule is raising an exception but
-	   failing to return NULL.  Do a PyErr_Occurred check to find out.
-	*/
-	if (PyErr_Occurred())
-		return NULL;
 	Py_RETURN_NONE;
 #undef FAIL
 }