test and fix looponfailing wrt to a bug introduced with the cmdline/session startup cleanup.
--HG-- branch : trunk
This commit is contained in:
parent
8d9e0712be
commit
1b0d6296dd
|
@ -22,9 +22,9 @@ class LooponfailingSession(Session):
|
||||||
self.remotecontrol = RemoteControl(self.config)
|
self.remotecontrol = RemoteControl(self.config)
|
||||||
self.out = py.io.TerminalWriter()
|
self.out = py.io.TerminalWriter()
|
||||||
|
|
||||||
def main(self, initialitems=None):
|
def main(self, initialitems):
|
||||||
try:
|
try:
|
||||||
self.loopstate = loopstate = LoopState(initialitems)
|
self.loopstate = loopstate = LoopState([])
|
||||||
self.remotecontrol.setup()
|
self.remotecontrol.setup()
|
||||||
while 1:
|
while 1:
|
||||||
self.loop_once(loopstate)
|
self.loop_once(loopstate)
|
||||||
|
|
|
@ -127,3 +127,25 @@ class TestLooponFailing:
|
||||||
|
|
||||||
session.loop_once(loopstate)
|
session.loop_once(loopstate)
|
||||||
assert len(loopstate.colitems) == 1
|
assert len(loopstate.colitems) == 1
|
||||||
|
|
||||||
|
|
||||||
|
def test_looponfail_functional_fail_to_ok(self, testdir):
|
||||||
|
p = testdir.makepyfile("""
|
||||||
|
def test_one():
|
||||||
|
x = 0
|
||||||
|
assert x == 1
|
||||||
|
""")
|
||||||
|
child = testdir.spawn_pytest("-f %s" % p)
|
||||||
|
child.expect("def test_one")
|
||||||
|
child.expect("x == 1")
|
||||||
|
child.expect("1 failed")
|
||||||
|
child.expect("### LOOPONFAILING ####")
|
||||||
|
child.expect("waiting for changes")
|
||||||
|
p.write(py.code.Source("""
|
||||||
|
def test_one():
|
||||||
|
x = 1
|
||||||
|
assert x == 1
|
||||||
|
"""))
|
||||||
|
child.expect(".*1 passed.*")
|
||||||
|
child.kill(15)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue