From 2ade3d5c89b93ea59ff287c05cbe67672b471cfe Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 20 Mar 2019 18:37:34 +0100
Subject: [PATCH 1/2] ci: rename "trial" tox factor to "twisted"

Ref: https://github.com/pytest-dev/pytest/pull/4848#issuecomment-467909204
---
 .travis.yml         |  4 ++--
 azure-pipelines.yml | 10 +++++-----
 tox.ini             | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 750f93f81..183cd6156 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,7 @@ jobs:
     # Specialized factors for py37.
     # Coverage for:
     # - test_sys_breakpoint_interception (via pexpect).
-    - env: TOXENV=py37-pexpect,py37-trial PYTEST_COVERAGE=1
+    - env: TOXENV=py37-pexpect,py37-twisted PYTEST_COVERAGE=1
     - env: TOXENV=py37-pluggymaster-xdist
     - env: TOXENV=py37-freeze
 
@@ -80,7 +80,7 @@ jobs:
     - stage: baseline
     # Coverage for:
     # - _pytest.unittest._handle_skip (via pexpect).
-      env: TOXENV=py27-pexpect,py27-trial PYTEST_COVERAGE=1
+      env: TOXENV=py27-pexpect,py27-twisted PYTEST_COVERAGE=1
       python: '2.7'
     # Use py36 here for faster baseline.
     - env: TOXENV=py36-xdist
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 712106c94..38d893ad4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,9 +30,9 @@ jobs:
         # - numpy
         # - pytester's LsofFdLeakChecker (being skipped)
         PYTEST_COVERAGE: '1'
-      py27-trial:
+      py27-twisted:
         python.version: '2.7'
-        tox.env: 'py27-trial'
+        tox.env: 'py27-twisted'
         python.needs_vc: True
       py27-pluggymaster-xdist:
         python.version: '2.7'
@@ -40,7 +40,7 @@ jobs:
         # Coverage for:
         # - except-IOError in _attempt_to_close_capture_file for py2.
         #   Also seen with py27-nobyte (using xdist), and py27-xdist.
-        #   But no exception with py27-pexpect,py27-trial,py27-numpy.
+        #   But no exception with py27-pexpect,py27-twisted,py27-numpy.
         PYTEST_COVERAGE: '1'
       pypy:
         python.version: 'pypy'
@@ -76,9 +76,9 @@ jobs:
       py37-linting/docs/doctesting:
         python.version: '3.7'
         tox.env: 'linting,docs,doctesting'
-      py37-trial/numpy:
+      py37-twisted/numpy:
         python.version: '3.7'
-        tox.env: 'py37-trial,py37-numpy'
+        tox.env: 'py37-twisted,py37-numpy'
       py37-pluggymaster-xdist:
         python.version: '3.7'
         tox.env: 'py37-pluggymaster-xdist'
diff --git a/tox.ini b/tox.ini
index 97cac6f6b..180f7755c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ envlist =
     py38
     pypy
     pypy3
-    {py27,py37}-{pexpect,xdist,trial,numpy,pluggymaster}
+    {py27,py37}-{pexpect,xdist,twisted,numpy,pluggymaster}
     py27-nobyte-xdist
     doctesting
     py37-freeze
@@ -67,7 +67,7 @@ basepython = python3
 deps = pre-commit>=1.11.0
 commands = pre-commit run --all-files --show-diff-on-failure
 
-[testenv:py27-trial]
+[testenv:py27-twisted]
 deps =
     {[testenv]deps}
     twisted
@@ -75,9 +75,9 @@ deps =
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
 
-[testenv:py37-trial]
-deps = {[testenv:py27-trial]deps}
-commands = {[testenv:py27-trial]commands}
+[testenv:py37-twisted]
+deps = {[testenv:py27-twisted]deps}
+commands = {[testenv:py27-twisted]commands}
 
 [testenv:docs]
 basepython = python3

From 543779fc43a5f5c847e08bf2789c306d0dcf01a7 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 20 Mar 2019 18:41:48 +0100
Subject: [PATCH 2/2] tox: generic twisted factor

---
 tox.ini | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/tox.ini b/tox.ini
index 180f7755c..352bdc514 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands =
     coverage: coverage report
 passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS
 setenv =
-    _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_XDIST:}
+    _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:}
 
     # Configuration to run with coverage similar to Travis/Appveyor, e.g.
     # "tox -e py37-coverage".
@@ -42,12 +42,16 @@ setenv =
     pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
     pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
 
+    twisted: _PYTEST_TOX_POSARGS_TWISTED=testing/test_unittest.py
+
     xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
 extras = testing
 deps =
     numpy: numpy
     pexpect: pexpect
     pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
+    twisted: twisted
+    twisted: unittest2
     xdist: pytest-xdist>=1.13
     {env:_PYTEST_TOX_EXTRA_DEP:}
 platform = {env:_PYTEST_TOX_PLATFORM:.*}
@@ -67,18 +71,6 @@ basepython = python3
 deps = pre-commit>=1.11.0
 commands = pre-commit run --all-files --show-diff-on-failure
 
-[testenv:py27-twisted]
-deps =
-    {[testenv]deps}
-    twisted
-    unittest2
-commands =
-    {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
-
-[testenv:py37-twisted]
-deps = {[testenv:py27-twisted]deps}
-commands = {[testenv:py27-twisted]commands}
-
 [testenv:docs]
 basepython = python3
 skipsdist = True