From 7144cec580c8d4561fa2e6d0ff0e23f4155658a3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 8 Nov 2011 22:06:57 +0000 Subject: [PATCH] avoid race condition in test, fix doc link --- doc/announce/index.txt | 1 + testing/acceptance_test.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/announce/index.txt b/doc/announce/index.txt index 08fed6ba6..9f7e09a35 100644 --- a/doc/announce/index.txt +++ b/doc/announce/index.txt @@ -5,6 +5,7 @@ Release announcements .. toctree:: :maxdepth: 2 + release-2.2.0 release-2.1.3 release-2.1.2 release-2.1.1 diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 85f137287..769f96a0c 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -538,7 +538,6 @@ class TestDurationWithFixture: frag = 0.01 def setup_function(func): time.sleep(frag * 3) - def test_1(): time.sleep(frag*2) def test_2(): @@ -552,7 +551,6 @@ class TestDurationWithFixture: result.stdout.fnmatch_lines([ "*durations*", "*setup*test_1*", - "*setup*test_2*", "*call*test_1*", "*call*test_2*", ])