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

re-introduce slaveinput/slaveoutput configure protocol

Browse Source
This commit is contained in:
holger krekel
2010-09-27 16:13:55 +02:00
parent c90c4a254c
commit 749faf5e7c
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
testing/acceptance_test.py
View File

@@ -175,8 +175,8 @@ class TestDistribution:
node.slaveinput['a'] = 42
node.slaveinput['b'] = 7
# This hook only takes action on slave.
def pytest_configure(config):
# this attribute is only set on slaves
if hasattr(config, 'slaveinput'):
a = config.slaveinput['a']
b = config.slaveinput['b']
@@ -187,7 +187,6 @@ class TestDistribution:
def pytest_testnodedown(node, error):
node.config.calc_result = node.slaveoutput['r']
# This hook only takes action on master.
def pytest_terminal_summary(terminalreporter):
if not hasattr(terminalreporter.config, 'slaveinput'):
calc_result = terminalreporter.config.calc_result
@@ -210,18 +209,20 @@ class TestDistribution:
""")
testdir.makeconftest("""
def pytest_sessionfinish(session):
# on the slave
if hasattr(session.config, 'slaveoutput'):
session.config.slaveoutput['s2'] = 42
# on the master
def pytest_testnodedown(node, error):
assert node.slaveoutput['s2'] == 42
print ("s2call-finished")
""")
args = ["-n1"]
args = ["-n1", "--debug"]
result = testdir.runpytest(*args)
s = result.stdout.str()
assert result.ret
assert 'SIGINT' in s
assert result.ret == 2
assert 's2call' in s
assert "Interrupted" in s
def test_keyboard_interrupt_dist(self, testdir):
# xxx could be refined to check for return code