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

Merge pull request #531 from mgorny/timeout

Browse Source
This commit is contained in:
Bruno Oliveira
2020-07-24 15:47:20 -03:00
committed by GitHub
parent 82730e5c6c e48491d4fd
commit fac0c14e28
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/acceptance_test.py
View File

@@ -331,7 +331,7 @@ class TestDistribution:
time.sleep(10) time.sleep(10)
""" """
) )
child = testdir.spawn_pytest("-n1 -v") child = testdir.spawn_pytest("-n1 -v", expect_timeout=30.0)
child.expect(".*test_sleep.*") child.expect(".*test_sleep.*")
child.kill(2) # keyboard interrupt child.kill(2) # keyboard interrupt
child.expect(".*KeyboardInterrupt.*") child.expect(".*KeyboardInterrupt.*")

4
testing/test_looponfail.py
View File

@@ -284,7 +284,7 @@ class TestFunctional:
) )
# p = testdir.mkdir("sub").join(p1.basename) # p = testdir.mkdir("sub").join(p1.basename)
# p1.move(p) # p1.move(p)
child = testdir.spawn_pytest("-f %s --traceconfig" % p) child = testdir.spawn_pytest("-f %s --traceconfig" % p, expect_timeout=30.0)
child.expect("def test_one") child.expect("def test_one")
child.expect("x == 1") child.expect("x == 1")
child.expect("1 failed") child.expect("1 failed")
@@ -311,7 +311,7 @@ class TestFunctional:
pass pass
""" """
) )
child = testdir.spawn_pytest("-f %s" % p) child = testdir.spawn_pytest("-f %s" % p, expect_timeout=30.0)
child.expect("1 xpass") child.expect("1 xpass")
# child.expect("### LOOPONFAILING ####") # child.expect("### LOOPONFAILING ####")
child.expect("waiting for changes") child.expect("waiting for changes")