rpms
/
python-pytest-cov
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update xdist patch

Browse Source
epel8
Orion Poplawski 9 years ago
parent a1800078c7
commit c04741d993
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

36
python-pytest-cov-xdist.patch
Unescape View File

@ -1,7 +1,7 @@
diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/test_pytest_cov.py diff -up pytest-cov-2.2.0/tests/test_pytest_cov.py.xdist pytest-cov-2.2.0/tests/test_pytest_cov.py
--- pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist 2015-08-22 18:04:15.000000000 -0600 --- pytest-cov-2.2.0/tests/test_pytest_cov.py.xdist 2015-10-03 07:33:53.000000000 -0600
+++ pytest-cov-2.1.0/tests/test_pytest_cov.py 2015-09-14 10:29:43.633141009 -0600 +++ pytest-cov-2.2.0/tests/test_pytest_cov.py 2015-10-05 09:07:26.548035911 -0600
@@ -102,6 +102,12 @@ def test_run_target(): @@ -124,6 +124,12 @@ def test_run_target():
p.join() p.join()
''' '''
@ -14,8 +14,8 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
SCRIPT_FAIL = ''' SCRIPT_FAIL = '''
def test_fail(): def test_fail():
assert False assert False
@@ -113,7 +119,11 @@ SCRIPT2_RESULT = '3 * 100%' @@ -135,7 +141,11 @@ SCRIPT2_RESULT = '3 * 100%'
CHILD_SCRIPT_RESULT = '6 * 100%' CHILD_SCRIPT_RESULT = '[56] * 100%'
PARENT_SCRIPT_RESULT = '8 * 100%' PARENT_SCRIPT_RESULT = '8 * 100%'
-xdist = pytest.mark.parametrize('opts', ['', '-n 1'], ids=['nodist', 'xdist']) -xdist = pytest.mark.parametrize('opts', ['', '-n 1'], ids=['nodist', 'xdist'])
@ -27,7 +27,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_central(testdir): def test_central(testdir):
@@ -253,6 +263,7 @@ show_missing = true @@ -291,6 +301,7 @@ show_missing = true
assert result.ret == 0 assert result.ret == 0
@ -35,7 +35,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_no_cov_on_fail(testdir): def test_no_cov_on_fail(testdir):
script = testdir.makepyfile(SCRIPT_FAIL) script = testdir.makepyfile(SCRIPT_FAIL)
@@ -266,6 +277,7 @@ def test_no_cov_on_fail(testdir): @@ -304,6 +315,7 @@ def test_no_cov_on_fail(testdir):
result.stdout.fnmatch_lines(['*1 failed*']) result.stdout.fnmatch_lines(['*1 failed*'])
@ -43,7 +43,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_combine_racecondition(testdir): def test_dist_combine_racecondition(testdir):
script = testdir.makepyfile(""" script = testdir.makepyfile("""
import pytest import pytest
@@ -292,6 +304,7 @@ def test_foo(foo): @@ -330,6 +342,7 @@ def test_foo(foo):
assert result.ret == 0 assert result.ret == 0
@ -51,7 +51,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_collocated(testdir): def test_dist_collocated(testdir):
script = testdir.makepyfile(SCRIPT) script = testdir.makepyfile(SCRIPT)
@@ -311,6 +324,7 @@ def test_dist_collocated(testdir): @@ -349,6 +362,7 @@ def test_dist_collocated(testdir):
assert result.ret == 0 assert result.ret == 0
@ -59,7 +59,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_not_collocated(testdir): def test_dist_not_collocated(testdir):
script = testdir.makepyfile(SCRIPT) script = testdir.makepyfile(SCRIPT)
dir1 = testdir.mkdir('dir1') dir1 = testdir.mkdir('dir1')
@@ -376,6 +390,7 @@ omit = @@ -438,6 +452,7 @@ omit =
assert result.ret == 0 assert result.ret == 0
@ -67,7 +67,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_subprocess_collocated(testdir): def test_dist_subprocess_collocated(testdir):
scripts = testdir.makepyfile(parent_script=SCRIPT_PARENT, scripts = testdir.makepyfile(parent_script=SCRIPT_PARENT,
child_script=SCRIPT_CHILD) child_script=SCRIPT_CHILD)
@@ -397,6 +412,7 @@ def test_dist_subprocess_collocated(test @@ -459,6 +474,7 @@ def test_dist_subprocess_collocated(test
assert result.ret == 0 assert result.ret == 0
@ -75,7 +75,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_subprocess_not_collocated(testdir, tmpdir): def test_dist_subprocess_not_collocated(testdir, tmpdir):
scripts = testdir.makepyfile(parent_script=SCRIPT_PARENT, scripts = testdir.makepyfile(parent_script=SCRIPT_PARENT,
child_script=SCRIPT_CHILD) child_script=SCRIPT_CHILD)
@@ -442,6 +458,7 @@ def test_empty_report(testdir): @@ -504,6 +520,7 @@ def test_empty_report(testdir):
assert not matching_lines assert not matching_lines
@ -83,7 +83,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_missing_data(testdir): def test_dist_missing_data(testdir):
venv_path = os.path.join(str(testdir.tmpdir), 'venv') venv_path = os.path.join(str(testdir.tmpdir), 'venv')
virtualenv.create_environment(venv_path) virtualenv.create_environment(venv_path)
@@ -548,6 +565,7 @@ def test_cover_conftest(testdir): @@ -616,6 +633,7 @@ def test_cover_conftest(testdir):
result.stdout.fnmatch_lines([CONF_RESULT]) result.stdout.fnmatch_lines([CONF_RESULT])
@ -91,7 +91,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_cover_looponfail(testdir, monkeypatch): def test_cover_looponfail(testdir, monkeypatch):
testdir.makepyfile(mod=MODULE) testdir.makepyfile(mod=MODULE)
testdir.makeconftest(CONFTEST) testdir.makeconftest(CONFTEST)
@@ -566,6 +584,7 @@ def test_cover_looponfail(testdir, monke @@ -634,6 +652,7 @@ def test_cover_looponfail(testdir, monke
) )
@ -99,7 +99,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_cover_conftest_dist(testdir): def test_cover_conftest_dist(testdir):
testdir.makepyfile(mod=MODULE) testdir.makepyfile(mod=MODULE)
testdir.makeconftest(CONFTEST) testdir.makeconftest(CONFTEST)
@@ -615,6 +634,7 @@ def test_coveragerc(testdir): @@ -683,6 +702,7 @@ def test_coveragerc(testdir):
result.stdout.fnmatch_lines(['test_coveragerc* %s' % EXCLUDED_RESULT]) result.stdout.fnmatch_lines(['test_coveragerc* %s' % EXCLUDED_RESULT])
@ -107,7 +107,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_coveragerc_dist(testdir): def test_coveragerc_dist(testdir):
testdir.makefile('', coveragerc=COVERAGERC) testdir.makefile('', coveragerc=COVERAGERC)
script = testdir.makepyfile(EXCLUDED_TEST) script = testdir.makepyfile(EXCLUDED_TEST)
@@ -661,7 +681,7 @@ def test_foo(): @@ -729,7 +749,7 @@ def test_foo():
SCRIPT_SIMPLE_RESULT = '4 * 100%' SCRIPT_SIMPLE_RESULT = '4 * 100%'
@ -116,7 +116,7 @@ diff -up pytest-cov-2.1.0/tests/test_pytest_cov.py.xdist pytest-cov-2.1.0/tests/
def test_dist_boxed(testdir): def test_dist_boxed(testdir):
script = testdir.makepyfile(SCRIPT_SIMPLE) script = testdir.makepyfile(SCRIPT_SIMPLE)
@@ -737,6 +757,7 @@ data_file = %s @@ -805,6 +825,7 @@ data_file = %s
assert glob.glob(str(testdir.tmpdir.join('some/special/place/coverage-data*'))) assert glob.glob(str(testdir.tmpdir.join('some/special/place/coverage-data*')))

Write Preview
Loading…
Cancel
Save