Merge lp:~gz/bzr/2.5_per_interrepository_random_test_874153 into lp:bzr/2.5

Proposed by Martin Packman on 2012-04-03
Status: Merged
Approved by: Martin Packman on 2012-04-30
Approved revision: 6495
Merged at revision: 6499
Proposed branch: lp:~gz/bzr/2.5_per_interrepository_random_test_874153
Merge into: lp:bzr/2.5
Diff against target: 15 lines (+4/-1)
1 file modified
bzrlib/tests/per_interrepository/test_fetch.py (+4/-1)
To merge this branch: bzr merge lp:~gz/bzr/2.5_per_interrepository_random_test_874153
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) 2012-04-03 Approve on 2012-04-10
Review via email: mp+100622@code.launchpad.net

Commit message

Treat spurious error on test case in per_interrepository as an expected failure

Description of the change

Give in and mark a test we've been having problems with on babune and the builders since smart server changes last year as randomly failing. That is, catch the error we know about, and use knownFailure when it happens.

It is only this *_smart_old variant that's problematic, right? Seems that way from looking at the past failures listed in the bug.

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/per_interrepository/test_fetch.py'
2--- bzrlib/tests/per_interrepository/test_fetch.py 2011-12-05 14:12:23 +0000
3+++ bzrlib/tests/per_interrepository/test_fetch.py 2012-04-03 14:48:25 +0000
4@@ -179,7 +179,10 @@
5 def test_fetch_parent_inventories_at_stacking_boundary_smart_old(self):
6 self.setup_smart_server_with_call_log()
7 self.disable_verb('Repository.insert_stream_1.19')
8- self.test_fetch_parent_inventories_at_stacking_boundary()
9+ try:
10+ self.test_fetch_parent_inventories_at_stacking_boundary()
11+ except errors.ConnectionReset:
12+ self.knownFailure("Random spurious failure, see bug 874153")
13
14 def test_fetch_parent_inventories_at_stacking_boundary(self):
15 """Fetch to a stacked branch copies inventories for parents of

Subscribers

People subscribed via source and target branches