launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/undisable-tests into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #785679 in Launchpad itself: "test_handleStatus_OK_successful_upload fails intermittently on buildbot"
  https://bugs.launchpad.net/launchpad/+bug/785679
  Bug #848994 in Launchpad itself: "fragile test test_mirror_with_destination_locked_by_another causes failure in subsequent tests"
  https://bugs.launchpad.net/launchpad/+bug/848994
  Bug #879197 in Launchpad itself: "test_linked_bugs_nonseries_branch_query_scaling disabled due to spurious failures"
  https://bugs.launchpad.net/launchpad/+bug/879197

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/undisable-tests/+merge/132235

Undisable three tests to see what the lay of the land is WRT them.
-- 
https://code.launchpad.net/~stevenk/launchpad/undisable-tests/+merge/132235
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/undisable-tests into lp:launchpad.

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2012-10-12 14:53:10 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2012-10-31 01:01:22 +0000
@@ -332,8 +332,7 @@
             self.assertTrue(
                 bugtask.status in UNRESOLVED_BUGTASK_STATUSES)
 
-    # XXX wgrant 2011-10-21 bug=879197: Disabled due to spurious failure.
-    def disabled_test_linked_bugs_nonseries_branch_query_scaling(self):
+    def test_linked_bugs_nonseries_branch_query_scaling(self):
         # As we add linked bugs, the query count for a branch index page stays
         # constant.
         branch = self.factory.makeAnyBranch()

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2012-09-18 18:36:09 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2012-10-31 01:01:22 +0000
@@ -650,12 +650,9 @@
         return self.assertDeferredNotifyCount(
             "OK", self.prepare_build(), 0)
 
-#XXX 2011-05-20 gmb bug=785679
-#    This test has been disabled since it broke intermittently in
-#    buildbot (but does not fail in isolation locally).
-##    def test_handleStatus_OK_successful_upload(self):
-##        return self.assertDeferredNotifyCount(
-##            "OK", self.prepare_build(True), 0)
+    def test_handleStatus_OK_successful_upload(self):
+        return self.assertDeferredNotifyCount(
+            "OK", self.prepare_build(True), 0)
 
 
 class MakeSPRecipeBuildMixin:

=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
--- lib/lp/codehosting/puller/tests/test_scheduler.py	2012-01-01 02:58:52 +0000
+++ lib/lp/codehosting/puller/tests/test_scheduler.py	2012-10-31 01:01:22 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# pylint: disable-msg=W0222,W0231
-
 __metaclass__ = type
 
 import logging
@@ -855,15 +853,13 @@
         return locking_process_deferred.addCallbacks(
             locking_process_callback, locking_process_errback)
 
-    # XXX wgrant 2011-09-14 bug 848994: This is a fragile test.
-    def DISABLE_test_mirror_with_destination_self_locked(self):
+    def test_mirror_with_destination_self_locked(self):
         # If the destination branch was locked by another worker, the worker
         # should break the lock and mirror the branch regardless.
         deferred = self._run_with_destination_locked(self.doDefaultMirroring)
         return deferred.addErrback(self._dumpError)
 
-    # XXX gary 2011-09-13 bug 848994: This is a fragile test.
-    def DISABLE_test_mirror_with_destination_locked_by_another(self):
+    def test_mirror_with_destination_locked_by_another(self):
         # When the destination branch is locked with a different lock it, the
         # worker should *not* break the lock and instead fail.