e26d4486fc
and improve heuristics for sending chunks where the chunksize depends on the number of remaining tests rather than fixed numbers. This reduces the number of master -> node messages (but not the reverse direction)
222 lines
6.8 KiB
Python
222 lines
6.8 KiB
Python
from xdist.dsession import (
|
|
DSession,
|
|
LoadScheduling,
|
|
EachScheduling,
|
|
report_collection_diff,
|
|
)
|
|
from _pytest import main as outcome
|
|
import py
|
|
import pytest
|
|
import execnet
|
|
|
|
XSpec = execnet.XSpec
|
|
|
|
def run(item, node, excinfo=None):
|
|
runner = item.config.pluginmanager.getplugin("runner")
|
|
rep = runner.ItemTestReport(item=item,
|
|
excinfo=excinfo, when="call")
|
|
rep.node = node
|
|
return rep
|
|
|
|
class MockGateway:
|
|
_count = 0
|
|
def __init__(self):
|
|
self.id = str(self._count)
|
|
self._count += 1
|
|
|
|
class MockNode:
|
|
def __init__(self):
|
|
self.sent = []
|
|
self.gateway = MockGateway()
|
|
|
|
def send_runtest_some(self, indices):
|
|
self.sent.extend(indices)
|
|
|
|
def send_runtest_all(self):
|
|
self.sent.append("ALL")
|
|
|
|
def shutdown(self):
|
|
self._shutdown=True
|
|
|
|
def dumpqueue(queue):
|
|
while queue.qsize():
|
|
print(queue.get())
|
|
|
|
class TestEachScheduling:
|
|
def test_schedule_load_simple(self):
|
|
node1 = MockNode()
|
|
node2 = MockNode()
|
|
sched = EachScheduling(2)
|
|
sched.addnode(node1)
|
|
sched.addnode(node2)
|
|
collection = ["a.py::test_1", ]
|
|
assert not sched.collection_is_completed
|
|
sched.addnode_collection(node1, collection)
|
|
assert not sched.collection_is_completed
|
|
sched.addnode_collection(node2, collection)
|
|
assert sched.collection_is_completed
|
|
assert sched.node2collection[node1] == collection
|
|
assert sched.node2collection[node2] == collection
|
|
sched.init_distribute()
|
|
assert sched.tests_finished()
|
|
assert node1.sent == ['ALL']
|
|
assert node2.sent == ['ALL']
|
|
sched.remove_item(node1, 0)
|
|
assert sched.tests_finished()
|
|
sched.remove_item(node2, 0)
|
|
assert sched.tests_finished()
|
|
|
|
def test_schedule_remove_node(self):
|
|
node1 = MockNode()
|
|
sched = EachScheduling(1)
|
|
sched.addnode(node1)
|
|
collection = ["a.py::test_1", ]
|
|
assert not sched.collection_is_completed
|
|
sched.addnode_collection(node1, collection)
|
|
assert sched.collection_is_completed
|
|
assert sched.node2collection[node1] == collection
|
|
sched.init_distribute()
|
|
assert sched.tests_finished()
|
|
crashitem = sched.remove_node(node1)
|
|
assert crashitem
|
|
assert sched.tests_finished()
|
|
assert not sched.hasnodes()
|
|
|
|
class TestLoadScheduling:
|
|
def test_schedule_load_simple(self):
|
|
node1 = MockNode()
|
|
node2 = MockNode()
|
|
sched = LoadScheduling(2)
|
|
sched.addnode(node1)
|
|
sched.addnode(node2)
|
|
collection = ["a.py::test_1", "a.py::test_2"]
|
|
assert not sched.collection_is_completed
|
|
sched.addnode_collection(node1, collection)
|
|
assert not sched.collection_is_completed
|
|
sched.addnode_collection(node2, collection)
|
|
assert sched.collection_is_completed
|
|
assert sched.node2collection[node1] == collection
|
|
assert sched.node2collection[node2] == collection
|
|
sched.init_distribute()
|
|
assert sched.tests_finished()
|
|
assert len(node1.sent) == 1
|
|
assert len(node2.sent) == 1
|
|
x = sorted(node1.sent + node2.sent)
|
|
assert x == [0, 1]
|
|
sched.remove_item(node1, node1.sent[0])
|
|
sched.remove_item(node2, node2.sent[0])
|
|
assert sched.tests_finished()
|
|
assert not sched.pending
|
|
|
|
def test_init_distribute_chunksize(self):
|
|
sched = LoadScheduling(2)
|
|
node1 = MockNode()
|
|
node2 = MockNode()
|
|
sched.addnode(node1)
|
|
sched.addnode(node2)
|
|
col = ["xyz"] * (3)
|
|
sched.addnode_collection(node1, col)
|
|
sched.addnode_collection(node2, col)
|
|
sched.init_distribute()
|
|
#assert not sched.tests_finished()
|
|
sent1 = node1.sent
|
|
sent2 = node2.sent
|
|
chunkitems = col[:1]
|
|
assert (sent1 == [0] and sent2 == [1]) or (
|
|
sent1 == [1] and sent2 == [0])
|
|
assert sched.node2pending[node1] == sent1
|
|
assert sched.node2pending[node2] == sent2
|
|
assert len(sched.pending) == 1
|
|
for node in (node1, node2):
|
|
for i in sched.node2pending[node]:
|
|
sched.remove_item(node, i)
|
|
assert not sched.pending
|
|
|
|
def test_add_remove_node(self):
|
|
node = MockNode()
|
|
sched = LoadScheduling(1)
|
|
sched.addnode(node)
|
|
collection = ["test_file.py::test_func"]
|
|
sched.addnode_collection(node, collection)
|
|
assert sched.collection_is_completed
|
|
sched.init_distribute()
|
|
assert not sched.pending
|
|
crashitem = sched.remove_node(node)
|
|
assert crashitem == collection[0]
|
|
|
|
|
|
class TestDistReporter:
|
|
|
|
@py.test.mark.xfail
|
|
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)
|
|
class gw1:
|
|
id = "X1"
|
|
spec = execnet.XSpec("popen")
|
|
class gw2:
|
|
id = "X2"
|
|
spec = execnet.XSpec("popen")
|
|
#class rinfo:
|
|
# version_info = (2, 5, 1, 'final', 0)
|
|
# executable = "hello"
|
|
# platform = "xyz"
|
|
# cwd = "qwe"
|
|
|
|
#dsession.pytest_xdist_newgateway(gw1, rinfo)
|
|
#linecomp.assert_contains_lines([
|
|
# "*X1*popen*xyz*2.5*"
|
|
#])
|
|
dsession.pytest_xdist_rsyncstart(source="hello", gateways=[gw1, gw2])
|
|
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']
|
|
assert report_collection_diff(from_collection, to_collection, 1, 2)
|
|
|
|
|
|
def test_report_collection_diff_different():
|
|
"""Test reporting of different collections."""
|
|
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'
|
|
)
|
|
|
|
try:
|
|
report_collection_diff(from_collection, to_collection, 1, 2)
|
|
except AssertionError as e:
|
|
assert py.builtin._totext(e) == error_message
|
|
|
|
@pytest.mark.xfail(reason="duplicate test ids not supported yet")
|
|
def test_pytest_issue419(testdir):
|
|
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
|