Skip to content

gh-118422: Fix run_fileexflags() test #118429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 30, 2024
Merged

gh-118422: Fix run_fileexflags() test #118429

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cba722
gh-118422: Fix run_fileexflags() test
vstinner Apr 30, 2024
fbef473
Add _Py_IsValidFD() helper function
vstinner Apr 30, 2024
a8ba0c1
Fix WASI
vstinner Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Modules/_testcapi/run.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,19 @@ run_fileexflags(PyObject *mod, PyObject *pos_args)
PyErr_SetFromErrnoWithFilename(PyExc_OSError, filename);
return NULL;
}
int fd = fileno(fp);

result = PyRun_FileExFlags(fp, filename, start, globals, locals, closeit, pflags);

#if defined(__linux__) || defined(MS_WINDOWS) || defined(__APPLE__)
/* The behavior of fileno() after fclose() is undefined, but it is
* the only practical way to check whether the file was closed.
* Only test this on the known platforms. */
if (closeit && result && fileno(fp) >= 0) {
struct stat st;
if (closeit && result && fstat(fd, &st) == 0) {
PyErr_SetString(PyExc_AssertionError, "File was not closed after excution");
Py_DECREF(result);
fclose(fp);
return NULL;
}
#endif
if (!closeit && fileno(fp) < 0) {

if (!closeit && fstat(fd, &st) != 0) {
PyErr_SetString(PyExc_AssertionError, "Bad file descriptor after excution");
Py_XDECREF(result);
return NULL;
Expand Down