Enhance tests

Author: vstinner

Lib/test/test_capi/test_object.py

@@ -251,15 +251,20 @@ def test_object_setattr_null_exc(self):
         class Obj:
             pass
         obj = Obj()
-
         obj.attr = 123
-        with self.assertRaises(SystemError):
-            _testcapi.object_setattr_null_exc(obj, 'attr')
-        self.assertTrue(hasattr(obj, 'attr'))
 
-        with self.assertRaises(SystemError):
-            _testcapi.object_setattrstring_null_exc(obj, 'attr')
-        self.assertTrue(hasattr(obj, 'attr'))
+        exc = ValueError("error")
+        with self.assertRaises(SystemError) as cm:
+            _testcapi.object_setattr_null_exc(obj, 'attr', exc)
+        self.assertIs(cm.exception.__context__, exc)
+        self.assertIsNone(cm.exception.__cause__)
+        self.assertHasAttr(obj, 'attr')
+
+        with self.assertRaises(SystemError) as cm:
+            _testcapi.object_setattrstring_null_exc(obj, 'attr', exc)
+        self.assertIs(cm.exception.__context__, exc)
+        self.assertIsNone(cm.exception.__cause__)
+        self.assertHasAttr(obj, 'attr')
 
 
 if __name__ == "__main__":

Modules/_testcapi/abstract.c

@@ -181,12 +181,12 @@ sequence_fast_get_item(PyObject *self, PyObject *args)
 static PyObject *
 object_setattr_null_exc(PyObject *self, PyObject *args)
 {
-    PyObject *obj, *name;
-    if (!PyArg_ParseTuple(args, "OO", &obj, &name)) {
+    PyObject *obj, *name, *exc;
+    if (!PyArg_ParseTuple(args, "OOO", &obj, &name, &exc)) {
         return NULL;
     }
 
-    PyErr_SetString(PyExc_ValueError, "error");
+    PyErr_SetObject((PyObject*)Py_TYPE(exc), exc);
     if (PyObject_SetAttr(obj, name, NULL) < 0) {
         return NULL;
     }
@@ -198,13 +198,13 @@ object_setattr_null_exc(PyObject *self, PyObject *args)
 static PyObject *
 object_setattrstring_null_exc(PyObject *self, PyObject *args)
 {
-    PyObject *obj;
+    PyObject *obj, *exc;
     const char *name;
-    if (!PyArg_ParseTuple(args, "Os", &obj, &name)) {
+    if (!PyArg_ParseTuple(args, "OsO", &obj, &name, &exc)) {
         return NULL;
     }
 
-    PyErr_SetString(PyExc_ValueError, "error");
+    PyErr_SetObject((PyObject*)Py_TYPE(exc), exc);
     if (PyObject_SetAttrString(obj, name, NULL) < 0) {
         return NULL;
     }