Launchpad itself

Merge lp:~stevenk/launchpad/undisable-tests into lp:launchpad

  1. undisable-tests
  2. Merge into devel
Proposed by Steve Kowalik on 2012-10-31
Status: Merged
Approved by: Steve Kowalik on 2012-10-31
Approved revision: no longer in the source branch.
Merged at revision: 16221
Proposed branch: lp:~stevenk/launchpad/undisable-tests
Merge into: lp:launchpad
Diff against target: 43 lines (+3/-8)
2 files modified
lib/lp/code/browser/tests/test_branch.py (+1/-2)
lib/lp/codehosting/puller/tests/test_scheduler.py (+2/-6)
To merge this branch: bzr merge lp:~stevenk/launchpad/undisable-tests
Reviewer Review Type Date Requested Status
Ian Booth (community) 2012-10-31 Approve on 2012-10-31
Review via email: mp+132235@code.launchpad.net

Commit Message

Undisable three tests to see if they fail spuriously with parallel tests.

Description of the Change

Undisable three tests to see what the lay of the land is WRT them.

To post a comment you must log in.
Ian Booth (wallyworld) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/browser/tests/test_branch.py'
2--- lib/lp/code/browser/tests/test_branch.py 2012-10-12 14:53:10 +0000
3+++ lib/lp/code/browser/tests/test_branch.py 2012-10-31 23:06:22 +0000
4@@ -332,8 +332,7 @@
5 self.assertTrue(
6 bugtask.status in UNRESOLVED_BUGTASK_STATUSES)
7
8- # XXX wgrant 2011-10-21 bug=879197: Disabled due to spurious failure.
9- def disabled_test_linked_bugs_nonseries_branch_query_scaling(self):
10+ def test_linked_bugs_nonseries_branch_query_scaling(self):
11 # As we add linked bugs, the query count for a branch index page stays
12 # constant.
13 branch = self.factory.makeAnyBranch()
14
15=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
16--- lib/lp/codehosting/puller/tests/test_scheduler.py 2012-01-01 02:58:52 +0000
17+++ lib/lp/codehosting/puller/tests/test_scheduler.py 2012-10-31 23:06:22 +0000
18@@ -1,8 +1,6 @@
19 # Copyright 2009-2011 Canonical Ltd. This software is licensed under the
20 # GNU Affero General Public License version 3 (see the file LICENSE).
21
22-# pylint: disable-msg=W0222,W0231
23-
24 __metaclass__ = type
25
26 import logging
27@@ -855,15 +853,13 @@
28 return locking_process_deferred.addCallbacks(
29 locking_process_callback, locking_process_errback)
30
31- # XXX wgrant 2011-09-14 bug 848994: This is a fragile test.
32- def DISABLE_test_mirror_with_destination_self_locked(self):
33+ def test_mirror_with_destination_self_locked(self):
34 # If the destination branch was locked by another worker, the worker
35 # should break the lock and mirror the branch regardless.
36 deferred = self._run_with_destination_locked(self.doDefaultMirroring)
37 return deferred.addErrback(self._dumpError)
38
39- # XXX gary 2011-09-13 bug 848994: This is a fragile test.
40- def DISABLE_test_mirror_with_destination_locked_by_another(self):
41+ def test_mirror_with_destination_locked_by_another(self):
42 # When the destination branch is locked with a different lock it, the
43 # worker should *not* break the lock and instead fail.
44