[Python-checkins] r76810 - python/branches/py3k/Modules/_testcapimodule.c
mark.dickinson
python-checkins at python.org
Sun Dec 13 21:03:21 CET 2009
Author: mark.dickinson
Date: Sun Dec 13 21:03:21 2009
New Revision: 76810
Log:
Make sure that test_capsule always returns NULL on error; this may
help diagnose the sporadic test_capi failures on Solaris.
Modified:
python/branches/py3k/Modules/_testcapimodule.c
Modified: python/branches/py3k/Modules/_testcapimodule.c
==============================================================================
--- python/branches/py3k/Modules/_testcapimodule.c (original)
+++ python/branches/py3k/Modules/_testcapimodule.c Sun Dec 13 21:03:21 2009
@@ -1298,6 +1298,21 @@
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
}
More information about the Python-checkins
mailing list