From 195b2e559933f26d1730dbbe531ee2f08c8f8b1f Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Sun, 3 Dec 2023 10:33:11 -0600
Subject: [PATCH] Drill down on non-empty TERM.

---
 .github/workflows/ci.yml | 44 +++++++++++++++++++++++++++++++++++++++-
 dtox.sh                  |  1 +
 tox.ini                  |  1 -
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 106ef3542..9ec90629b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,6 +60,45 @@ jobs:
           - pypy310-pip20
           - pypy310-pip22_3_1
           - pypy310-pip23_1_2
+    steps:
+      - name: Free Up Disk Space
+        uses: jlumbroso/free-disk-space@v1.3.0
+        with:
+          android: true # ~14GB
+          dotnet: true # ~2GB
+          tool-cache: true # ~12GB
+
+          # Too little space savings or too slow.
+          haskell: false
+          large-packages: false
+          docker-images: false
+          swap-storage: false
+      - name: Checkout Pex
+        uses: actions/checkout@v3
+        with:
+          # We need branches and tags for some ITs.
+          fetch-depth: 0
+      # Some ITs need this for VCS URLs of the form git+ssh://git@github.com/...
+      - name: Setup SSH Agent
+        uses: webfactory/ssh-agent@v0.5.4
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        if: env.SSH_PRIVATE_KEY != ''
+        with:
+          ssh-private-key: ${{ env.SSH_PRIVATE_KEY }}
+      - name: Run Tests
+        run: |
+          TERM=xterm \
+          BASE_MODE=pull \
+          CACHE_MODE=pull \
+            ./dtox.sh -e ${{ matrix.tox-env }} -- ${{ env._PEX_TEST_POS_ARGS }}
+  linux-tests-2:
+    name: ./dtox.sh -e ${{ matrix.tox-env }}
+    needs: org-check
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        tox-env:
           - py27-pip20-integration
           - py37-pip22_3_1-integration
           - py37-pip23_1_2-integration
@@ -98,7 +137,10 @@ jobs:
           ssh-private-key: ${{ env.SSH_PRIVATE_KEY }}
       - name: Run Tests
         run: |
-          BASE_MODE=pull CACHE_MODE=pull ./dtox.sh -e ${{ matrix.tox-env }} -- ${{ env._PEX_TEST_POS_ARGS }}
+          TERM=xterm \
+          BASE_MODE=pull \
+          CACHE_MODE=pull \
+            ./dtox.sh -e ${{ matrix.tox-env }} -- ${{ env._PEX_TEST_POS_ARGS }}
   mac-tests:
     name: tox -e ${{ matrix.tox-env }}
     needs: org-check
diff --git a/dtox.sh b/dtox.sh
index 739568430..d6502946b 100755
--- a/dtox.sh
+++ b/dtox.sh
@@ -106,6 +106,7 @@ exec docker run \
   --volume pex-caches:/development/pex_dev \
   --volume "${ROOT}:/development/pex" \
   --volume pex-tox:/development/pex/.tox \
+  --env TERM="${TERM}" \
   "${DOCKER_ARGS[@]}" \
   "pantsbuild/pex/user:${user_hash}" \
   "$@"
diff --git a/tox.ini b/tox.ini
index dd1ab9ac5..1f4d352c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,7 +49,6 @@ passenv =
     SSH_AUTH_SOCK
     # Needed for interactive tests.
     TERM
-    TERMINFO
 setenv =
     pip20: _PEX_PIP_VERSION=20.3.4-patched
     pip22_2: _PEX_PIP_VERSION=22.2.2