launchpad-reviewers team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/launchpad/bug1007576 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1007576 in Launchpad itself: "lp.services.job.tests.test_retry_jobs_with_celery.TestRetryJobsViaCelery.test_jobs_with_retry_exceptions_are_queued_again fails intermittently/rarely in parallel tests"
  https://bugs.launchpad.net/launchpad/+bug/1007576

For more details, see:
https://code.launchpad.net/~gary/launchpad/bug1007576/+merge/108609

This simply increases a timeout for the test to accommodate increased run time for some tasks in parallel tests.
-- 
https://code.launchpad.net/~gary/launchpad/bug1007576/+merge/108609
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gary/launchpad/bug1007576 into lp:launchpad.

=== modified file 'lib/lp/services/job/tests/test_retry_jobs_with_celery.py'
--- lib/lp/services/job/tests/test_retry_jobs_with_celery.py	2012-05-16 19:23:54 +0000
+++ lib/lp/services/job/tests/test_retry_jobs_with_celery.py	2012-06-04 18:36:20 +0000
@@ -118,7 +118,11 @@
                     dbjob.status == JobStatus.COMPLETED and
                     dbjob.attempt_count == 2)
             count = 0
-            while count < 50 and not job_finished():
+            while count < 300 and not job_finished():
+                # We have a maximum wait of one minute.  We should not get
+                # anywhere close to that on developer machines (10 seconds was
+                # working fine), but when the test suite is run in parallel we
+                # can need a lot more time (see bug 1007576).
                 sleep(0.2)
                 count += 1