Run pre-commit: black, whitespaces, rst
This commit is contained in:
@@ -1,9 +1,6 @@
|
||||
from xdist.dsession import DSession
|
||||
from xdist.report import report_collection_diff
|
||||
from xdist.scheduler import (
|
||||
EachScheduling,
|
||||
LoadScheduling,
|
||||
)
|
||||
from xdist.scheduler import EachScheduling, LoadScheduling
|
||||
|
||||
import py
|
||||
import pytest
|
||||
@@ -60,7 +57,7 @@ class TestEachScheduling:
|
||||
sched = EachScheduling(config)
|
||||
sched.add_node(node1)
|
||||
sched.add_node(node2)
|
||||
collection = ["a.py::test_1", ]
|
||||
collection = ["a.py::test_1"]
|
||||
assert not sched.collection_is_completed
|
||||
sched.add_node_collection(node1, collection)
|
||||
assert not sched.collection_is_completed
|
||||
@@ -70,8 +67,8 @@ class TestEachScheduling:
|
||||
assert sched.node2collection[node2] == collection
|
||||
sched.schedule()
|
||||
assert sched.tests_finished
|
||||
assert node1.sent == ['ALL']
|
||||
assert node2.sent == ['ALL']
|
||||
assert node1.sent == ["ALL"]
|
||||
assert node2.sent == ["ALL"]
|
||||
sched.mark_test_complete(node1, 0)
|
||||
assert sched.tests_finished
|
||||
sched.mark_test_complete(node2, 0)
|
||||
@@ -82,7 +79,7 @@ class TestEachScheduling:
|
||||
config = testdir.parseconfig("--tx=popen")
|
||||
sched = EachScheduling(config)
|
||||
sched.add_node(node1)
|
||||
collection = ["a.py::test_1", ]
|
||||
collection = ["a.py::test_1"]
|
||||
assert not sched.collection_is_completed
|
||||
sched.add_node_collection(node1, collection)
|
||||
assert sched.collection_is_completed
|
||||
@@ -230,7 +227,7 @@ class TestLoadScheduling:
|
||||
sched.schedule()
|
||||
assert len(collect_hook.reports) == 1
|
||||
rep = collect_hook.reports[0]
|
||||
assert 'Different tests were collected between' in rep.longrepr
|
||||
assert "Different tests were collected between" in rep.longrepr
|
||||
|
||||
|
||||
class TestDistReporter:
|
||||
@@ -238,6 +235,7 @@ class TestDistReporter:
|
||||
def test_rsync_printing(self, testdir, linecomp):
|
||||
config = testdir.parseconfig()
|
||||
from _pytest.pytest_terminal import TerminalReporter
|
||||
|
||||
rep = TerminalReporter(config, file=linecomp.stringio)
|
||||
config.pluginmanager.register(rep, "terminalreporter")
|
||||
dsession = DSession(config)
|
||||
@@ -249,6 +247,7 @@ class TestDistReporter:
|
||||
class gw2:
|
||||
id = "X2"
|
||||
spec = execnet.XSpec("popen")
|
||||
|
||||
# class rinfo:
|
||||
# version_info = (2, 5, 1, 'final', 0)
|
||||
# executable = "hello"
|
||||
@@ -260,47 +259,50 @@ class TestDistReporter:
|
||||
# "*X1*popen*xyz*2.5*"
|
||||
# ])
|
||||
dsession.pytest_xdist_rsyncstart(source="hello", gateways=[gw1, gw2])
|
||||
linecomp.assert_contains_lines(["[X1,X2] rsyncing: hello", ])
|
||||
linecomp.assert_contains_lines(["[X1,X2] rsyncing: hello"])
|
||||
|
||||
|
||||
def test_report_collection_diff_equal():
|
||||
"""Test reporting of equal collections."""
|
||||
from_collection = to_collection = ['aaa', 'bbb', 'ccc']
|
||||
from_collection = to_collection = ["aaa", "bbb", "ccc"]
|
||||
assert report_collection_diff(from_collection, to_collection, 1, 2) is None
|
||||
|
||||
|
||||
def test_report_collection_diff_different():
|
||||
"""Test reporting of different collections."""
|
||||
from_collection = ['aaa', 'bbb', 'ccc', 'YYY']
|
||||
to_collection = ['aZa', 'bbb', 'XXX', 'ccc']
|
||||
from_collection = ["aaa", "bbb", "ccc", "YYY"]
|
||||
to_collection = ["aZa", "bbb", "XXX", "ccc"]
|
||||
error_message = (
|
||||
'Different tests were collected between 1 and 2. The difference is:\n'
|
||||
'--- 1\n'
|
||||
'\n'
|
||||
'+++ 2\n'
|
||||
'\n'
|
||||
'@@ -1,4 +1,4 @@\n'
|
||||
'\n'
|
||||
'-aaa\n'
|
||||
'+aZa\n'
|
||||
' bbb\n'
|
||||
'+XXX\n'
|
||||
' ccc\n'
|
||||
'-YYY')
|
||||
"Different tests were collected between 1 and 2. The difference is:\n"
|
||||
"--- 1\n"
|
||||
"\n"
|
||||
"+++ 2\n"
|
||||
"\n"
|
||||
"@@ -1,4 +1,4 @@\n"
|
||||
"\n"
|
||||
"-aaa\n"
|
||||
"+aZa\n"
|
||||
" bbb\n"
|
||||
"+XXX\n"
|
||||
" ccc\n"
|
||||
"-YYY"
|
||||
)
|
||||
|
||||
msg = report_collection_diff(from_collection, to_collection, '1', '2')
|
||||
msg = report_collection_diff(from_collection, to_collection, "1", "2")
|
||||
assert msg == error_message
|
||||
|
||||
|
||||
@pytest.mark.xfail(reason="duplicate test ids not supported yet")
|
||||
def test_pytest_issue419(testdir):
|
||||
testdir.makepyfile("""
|
||||
testdir.makepyfile(
|
||||
"""
|
||||
import pytest
|
||||
|
||||
@pytest.mark.parametrize('birth_year', [1988, 1988, ])
|
||||
def test_2011_table(birth_year):
|
||||
pass
|
||||
""")
|
||||
"""
|
||||
)
|
||||
reprec = testdir.inline_run("-n1")
|
||||
reprec.assertoutcome(passed=2)
|
||||
assert 0
|
||||
|
||||
Reference in New Issue
Block a user