floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid race condition in test, fix doc link

This commit is contained in:
holger krekel 2011-11-08 22:06:57 +00:00
parent 99a1188287
commit 7144cec580
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/announce/index.txt
View File

@ -5,6 +5,7 @@ Release announcements
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
release-2.2.0
release-2.1.3 release-2.1.3
release-2.1.2 release-2.1.2
release-2.1.1 release-2.1.1

2
testing/acceptance_test.py
View File

@ -538,7 +538,6 @@ class TestDurationWithFixture:
frag = 0.01 frag = 0.01
def setup_function(func): def setup_function(func):
time.sleep(frag * 3) time.sleep(frag * 3)
def test_1(): def test_1():
time.sleep(frag*2) time.sleep(frag*2)
def test_2(): def test_2():
@ -552,7 +551,6 @@ class TestDurationWithFixture:
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*durations*", "*durations*",
"*setup*test_1*", "*setup*test_1*",
"*setup*test_2*",
"*call*test_1*", "*call*test_1*",
"*call*test_2*", "*call*test_2*",
]) ])