ci: Travis: COLUMNS=120 (#93)

blueyed · Nov 7, 2019 · 0c0c1c5 · 0c0c1c5
1 parent 0c000c3
commit 0c0c1c5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -52,7 +52,7 @@ before_script:
     fi
   - tox --notest -vv
 
-script: tox -vv
+script: env COLUMNS=120 tox -vv
 
 after_success:
   - |

diff --git a/testing/test_pytester.py b/testing/test_pytester.py
@@ -583,8 +583,6 @@ def test_testdir_respects_monkeypatch(method, testdir, monkeypatch):
         monkeypatch.setenv("COLUMNS", "12")
     else:
         assert method == "delenv"
-        with pytest.raises(KeyError):
-            monkeypatch.delenv("COLUMNS")
         monkeypatch.delenv("COLUMNS", raising=False)
     assert "COLUMNS" not in testdir._get_env_run_update()
 

diff --git a/tox.ini b/tox.ini
@@ -21,7 +21,7 @@ commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
     coverage: coverage combine
     coverage: coverage report -m
-passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS PYTEST_REORDER_TESTS TERM
+passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS PYTEST_REORDER_TESTS TERM COLUMNS
 setenv =
     _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}