From cb89b08bcfa5c0a657c368a1b321d0ab69e8536c Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 16 May 2020 19:41:39 -0400 Subject: [PATCH 1/2] Shift a comma a little --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0cbb273..b3cf23c 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ integration server or simply if you don't know why the test suite hangs. Note that while by default on POSIX systems py.test will continue to -execute the tests after a test has timed, out this is not always +execute the tests after a test has timed out, this is not always possible. Often the only sure way to interrupt a hanging test is by terminating the entire process. As this is a hard termination (``os._exit()``) it will result in no teardown, JUnit XML output etc. From c126a176e97e5a6367c25d2bcc5c6e87cf3166fe Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Sat, 23 May 2020 19:54:01 +0200 Subject: [PATCH 2/2] Fix blank line from merge --- README.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/README.rst b/README.rst index a4fcfd1..b784069 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,6 @@ time. This is useful when running tests under a continuous integration server or simply if you don't know why the test suite hangs. - Note that while by default on POSIX systems pytest will continue to execute the tests after a test has timed out, this is not always possible. Often the only sure way to interrupt a hanging test is by