Skip to content

Commit 58fec20

Browse files
committed
Move timeout config options into correct section
The interrupt_timeout and terminate_timeout options are set on the environment, not globally.
1 parent dd0bb80 commit 58fec20

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

docs/config.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,6 @@ Global settings are defined under the ``tox`` section as:
160160
Name of the virtual environment used to create a source distribution from the
161161
source tree.
162162

163-
.. conf:: interrupt_timeout ^ float ^ 0.3
164-
165-
.. versionadded:: 3.15.0
166-
167-
When tox is interrupted, it propagates the signal to the child process,
168-
waits :conf:``interrupt_timeout`` seconds, and sends it a SIGTERM if it hasn't
169-
exited.
170-
171-
.. conf:: terminate_timeout ^ float ^ 0.2
172-
173-
.. versionadded:: 3.15.0
174-
175-
When tox is interrupted, it propagates the signal to the child process,
176-
waits :conf:``interrupt_timeout`` seconds, sends it a SIGTERM, waits
177-
:conf:``terminate_timeout`` seconds, and sends it a SIGKILL if it hasn't exited.
178-
179163
Jenkins override
180164
++++++++++++++++
181165

@@ -597,6 +581,22 @@ Complete list of settings that you can put into ``testenv*`` sections:
597581
via the ``-e`` tox will only run those three (even if ``coverage`` may specify as ``depends`` other targets too -
598582
such as ``py27, py35, py36, py37``).
599583

584+
.. conf:: interrupt_timeout ^ float ^ 0.3
585+
586+
.. versionadded:: 3.15.0
587+
588+
When tox is interrupted, it propagates the signal to the child process,
589+
waits :conf:``interrupt_timeout`` seconds, and sends it a SIGTERM if it hasn't
590+
exited.
591+
592+
.. conf:: terminate_timeout ^ float ^ 0.2
593+
594+
.. versionadded:: 3.15.0
595+
596+
When tox is interrupted, it propagates the signal to the child process,
597+
waits :conf:``interrupt_timeout`` seconds, sends it a SIGTERM, waits
598+
:conf:``terminate_timeout`` seconds, and sends it a SIGKILL if it hasn't exited.
599+
600600
Substitutions
601601
-------------
602602

0 commit comments

Comments
 (0)