Skip to content

Commit 0c0c1c5

Browse files
authored
ci: Travis: COLUMNS=120 (#93)
1 parent 0c000c3 commit 0c0c1c5

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ before_script:
5252
fi
5353
- tox --notest -vv
5454

55-
script: tox -vv
55+
script: env COLUMNS=120 tox -vv
5656

5757
after_success:
5858
- |

testing/test_pytester.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,6 @@ def test_testdir_respects_monkeypatch(method, testdir, monkeypatch):
583583
monkeypatch.setenv("COLUMNS", "12")
584584
else:
585585
assert method == "delenv"
586-
with pytest.raises(KeyError):
587-
monkeypatch.delenv("COLUMNS")
588586
monkeypatch.delenv("COLUMNS", raising=False)
589587
assert "COLUMNS" not in testdir._get_env_run_update()
590588

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ commands =
2121
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
2222
coverage: coverage combine
2323
coverage: coverage report -m
24-
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS PYTEST_REORDER_TESTS TERM
24+
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS PYTEST_REORDER_TESTS TERM COLUMNS
2525
setenv =
2626
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}
2727

0 commit comments

Comments
 (0)