From 0c0c1c5e554fd234662112193b37cc514e571deb Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 7 Nov 2019 16:37:39 +0100 Subject: [PATCH] ci: Travis: COLUMNS=120 (#93) --- .travis.yml | 2 +- testing/test_pytester.py | 2 -- tox.ini | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e0295d8bd5..0974441a508 100644 --- 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 index cb4dbf01e22..df433f34a36 100644 --- 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 index 2ab8398f2a3..2bd93df45bc 100644 --- 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:}