IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #393 from nicoddemus/fix-master

Browse Source 
Fix test_remote_usage_prog which started to break with pytest@features
This commit is contained in:
Daniel Hahler
2018-12-12 23:15:45 +01:00
committed by GitHub
parent 95aaaec6c5 2b65800738
commit c306287a4e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
testing/test_remote.py
View File

@@ -1,4 +1,3 @@
import os
import py import py
import pprint import pprint
import pytest import pytest
@@ -433,8 +432,6 @@ def test_remote_mainargv(testdir):
def test_remote_usage_prog(testdir, request): def test_remote_usage_prog(testdir, request):
if not hasattr(request.config._parser, "prog"): if not hasattr(request.config._parser, "prog"):
pytest.skip("prog not available in config parser") pytest.skip("prog not available in config parser")
prog = os.path.basename(sys.argv[0])
testdir.makeconftest( testdir.makeconftest(
""" """
import pytest import pytest
@@ -462,5 +459,5 @@ def test_remote_usage_prog(testdir, request):
result = testdir.runpytest_subprocess("-n1") result = testdir.runpytest_subprocess("-n1")
assert result.ret == 1 assert result.ret == 1
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
["usage: %s *" % prog, "%s: error: my_usage_error" % prog] ["usage: pytest.py *", "pytest.py: error: my_usage_error"]
) )