Staging
v0.8.1
https://github.com/python/cpython
Revision bcf042ff98b6261b7780c1e40fa1681ef30502f9 authored by Miss Islington (bot) on 12 September 2017, 23:14:09 UTC, committed by Victor Stinner on 12 September 2017, 23:14:09 UTC
* test_thread.test_forkinthread() now waits until the thread completes.
* Check the status in the test method, not in the thread function
* Don't ignore RuntimeError anymore: since the commit
  346cbd351ee0dd3ab9cb9f0e4cb625556707877e (bpo-16500,
  os.register_at_fork(), os.fork() cannot fail anymore with
  RuntimeError.
* Replace 0.01 literal with a new POLL_SLEEP constant
* test_forkinthread(): test if os.fork() exists rather than testing
  the platform.
(cherry picked from commit a15d155aadfad232158f530278505cdc6f326f93)
1 parent c0e7736
Raw File
Tip revision: bcf042ff98b6261b7780c1e40fa1681ef30502f9 authored by Miss Islington (bot) on 12 September 2017, 23:14:09 UTC
[3.6] bpo-31234: Enhance test_thread.test_forkinthread() (GH-3516) (#3519)
Tip revision: bcf042f
dup2.c
/*
 * Public domain dup2() lookalike
 * by Curtis Jackson @ AT&T Technologies, Burlington, NC
 * electronic address:  burl!rcj
 *
 * dup2 performs the following functions:
 *
 * Check to make sure that fd1 is a valid open file descriptor.
 * Check to see if fd2 is already open; if so, close it.
 * Duplicate fd1 onto fd2; checking to make sure fd2 is a valid fd.
 * Return fd2 if all went well; return BADEXIT otherwise.
 */

#include <fcntl.h>
#include <unistd.h>

#define BADEXIT -1

int
dup2(int fd1, int fd2)
{
	if (fd1 != fd2) {
		if (fcntl(fd1, F_GETFL) < 0)
			return BADEXIT;
		if (fcntl(fd2, F_GETFL) >= 0)
			close(fd2);
		if (fcntl(fd1, F_DUPFD, fd2) < 0)
			return BADEXIT;
	}
	return fd2;
}
back to top