Commit 7f04d4d4 authored by Victor Stinner's avatar Victor Stinner

Issue #23708: Split assertion expression in two assertions in _Py_read() and

_Py_write() to know which test failed on the buildbot "AMD64 Snow Leop 3.x".
parent fbd6f9ed
...@@ -1178,7 +1178,8 @@ _Py_read(int fd, void *buf, size_t count) ...@@ -1178,7 +1178,8 @@ _Py_read(int fd, void *buf, size_t count)
if (async_err) { if (async_err) {
/* read() was interrupted by a signal (failed with EINTR) /* read() was interrupted by a signal (failed with EINTR)
* and the Python signal handler raised an exception */ * and the Python signal handler raised an exception */
assert(errno == EINTR && PyErr_Occurred()); assert(errno == EINTR);
assert(PyErr_Occurred());
return -1; return -1;
} }
if (n < 0) { if (n < 0) {
...@@ -1254,7 +1255,8 @@ _Py_write(int fd, const void *buf, size_t count) ...@@ -1254,7 +1255,8 @@ _Py_write(int fd, const void *buf, size_t count)
if (async_err) { if (async_err) {
/* write() was interrupted by a signal (failed with EINTR) /* write() was interrupted by a signal (failed with EINTR)
* and the Python signal handler raised an exception */ * and the Python signal handler raised an exception */
assert(errno == EINTR && PyErr_Occurred()); assert(errno == EINTR);
assert(PyErr_Occurred());
return -1; return -1;
} }
if (n < 0) { if (n < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment