Simplify.

.github/workflows/ci.yml

@@ -176,9 +176,7 @@ jobs:
       - name: Install Tor [macOS, ${{ matrix.python-version }} ]
         if: ${{ contains(matrix.os, 'macos') }}
         run: |
-          brew extract --version 0.4.6.9 tor homebrew/cask
-          brew install tor@0.4.6.9
-          brew link --overwrite tor@0.4.6.9
+          brew install tor
 
       - name: Install Tor [Windows]
         if: matrix.os == 'windows-latest'
@@ -218,7 +216,7 @@ jobs:
         run: python misc/build_helpers/show-tool-versions.py
 
       - name: Run "Python 3 integration tests"
-        run: tox -e integration3
+        run: tox -e integration
 
       - name: Upload eliot.log in case of failure
         uses: actions/upload-artifact@v1

tox.ini

@@ -16,7 +16,7 @@ python =
 twisted = 1
 
 [tox]
-envlist = typechecks,codechecks,py{37,38,39}-{coverage},pypy27,pypy3,integration,integration3
+envlist = typechecks,codechecks,py{37,38,39}-{coverage},pypy27,pypy3,integration
 minversion = 2.4
 
 [testenv]
@@ -86,21 +86,12 @@ commands =
          coverage: coverage report
 
 [testenv:integration]
-setenv =
-         COVERAGE_PROCESS_START=.coveragerc
-commands =
-         # NOTE: 'run with "py.test --keep-tempdir -s -v integration/" to debug failures'
-         py.test --timeout=1800 --coverage -v {posargs:integration}
-         coverage combine
-         coverage report
-
-
-[testenv:integration3]
 basepython = python3
 setenv =
          COVERAGE_PROCESS_START=.coveragerc
+         # Without this, temporary file paths are too long on macOS, breaking tor
+
 commands =
-         python --version
          # NOTE: 'run with "py.test --keep-tempdir -s -v integration/" to debug failures'
          py.test --timeout=1800 --coverage -v {posargs:integration}
          coverage combine