launchpad-reviewers team mailing list archive

[Colin Watson <mp+414186@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:bump-celery-timeout into turnip:master.

Commit message:
Bump test celery timeout to 10 seconds

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/414186

I've seen it take a bit longer in test runs (e.g. https://jenkins.ols.canonical.com/online-services/job/turnip/330/consoleFull).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:bump-celery-timeout into turnip:master.

diff --git a/turnip/api/tests/test_api.py b/turnip/api/tests/test_api.py
index facd042..9737eb0 100644
--- a/turnip/api/tests/test_api.py
+++ b/turnip/api/tests/test_api.py
@@ -398,7 +398,7 @@ class ApiTestCase(TestCase, ApiRepoStoreMixin):
             return ('refs/merge/123/head' in repo2_refs and
                     'refs/merge/987/head' in repo3_refs)
 
-        celery_fixture.waitUntil(5, branchCreated)
+        celery_fixture.waitUntil(10, branchCreated)
         self.assertEqual(4, len(repo2.references.objects))
         self.assertEqual(202, resp.status_code)
         self.assertEqual(b'', resp.body)
diff --git a/turnip/api/tests/test_store.py b/turnip/api/tests/test_store.py
index 0f1acc5..852ddd5 100644
--- a/turnip/api/tests/test_store.py
+++ b/turnip/api/tests/test_store.py
@@ -386,7 +386,7 @@ class InitTestCase(TestCase):
         dest_ref_name = 'refs/merge/123'
         store.fetch_refs.apply_async(args=([
             (orig_path, orig_commit_oid.hex, dest_path, dest_ref_name)], ))
-        celery_fixture.waitUntil(5, lambda: len(dest.references.objects) == 1)
+        celery_fixture.waitUntil(10, lambda: len(dest.references.objects) == 1)
 
         self.assertEqual(1, len(dest.references.objects))
         copied_ref = dest.references.objects[0]
@@ -411,7 +411,7 @@ class InitTestCase(TestCase):
                 return dest[orig_blob_id].data == b'changed foobar content'
             except KeyError:
                 return False
-        celery_fixture.waitUntil(5, waitForNewCommit)
+        celery_fixture.waitUntil(10, waitForNewCommit)
 
         self.assertEqual(1, len(dest.references.objects))
         copied_ref = dest.references.objects[0]
@@ -441,7 +441,7 @@ class InitTestCase(TestCase):
         operations = [(orig_path, new_ref_name)]
         store.delete_refs.apply_async((operations, ))
         celery_fixture.waitUntil(
-            5, lambda: len(orig.references.objects) < before_refs_len)
+            10, lambda: len(orig.references.objects) < before_refs_len)
 
         self.assertEqual(before_refs_len - 1, len(orig.references.objects))
         self.assertNotIn(
@@ -475,7 +475,7 @@ class InitTestCase(TestCase):
 
         # Assert we have 0 loose objects after repack job ran
         celery_fixture.waitUntil(
-            5, lambda: self.hasZeroLooseObjects(orig_path))
+            10, lambda: self.hasZeroLooseObjects(orig_path))
 
     def test_gc(self):
         celery_fixture = CeleryWorkerFixture()
@@ -492,4 +492,4 @@ class InitTestCase(TestCase):
 
         # Assert we have 0 loose objects after a gc job ran
         celery_fixture.waitUntil(
-            5, lambda: self.hasZeroLooseObjects(orig_path))
+            10, lambda: self.hasZeroLooseObjects(orig_path))