floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5174 from blueyed/no-terminal 

Terminal plugin is not semi-essential anymore
This commit is contained in:
Daniel Hahler 2019-04-27 09:51:32 +02:00 committed by GitHub
parent ac7ee40aaf 65133018f3
commit ebc0cea226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/config/__init__.py
View File

@ -123,7 +123,7 @@ essential_plugins = (
) )
default_plugins = essential_plugins + ( default_plugins = essential_plugins + (
"terminal", # Has essential options, but xdist uses -pno:terminal. "terminal",
"debugging", "debugging",
"unittest", "unittest",
"capture", "capture",

10
testing/test_config.py
View File

@ -1232,8 +1232,10 @@ def test_config_blocked_default_plugins(testdir, plugin):
if plugin != "terminal": if plugin != "terminal":
result.stdout.fnmatch_lines(["* 1 passed in *"]) result.stdout.fnmatch_lines(["* 1 passed in *"])
if plugin != "terminal": # fails to report due to its options being used elsewhere. p = testdir.makepyfile("def test(): assert 0")
p = testdir.makepyfile("def test(): assert 0") result = testdir.runpytest(str(p), "-pno:%s" % plugin)
result = testdir.runpytest(str(p), "-pno:%s" % plugin) assert result.ret == EXIT_TESTSFAILED
assert result.ret == EXIT_TESTSFAILED if plugin != "terminal":
result.stdout.fnmatch_lines(["* 1 failed in *"]) result.stdout.fnmatch_lines(["* 1 failed in *"])
else:
assert result.stdout.lines == [""]