← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:loosen-more-test-timeouts into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:loosen-more-test-timeouts into launchpad:master.

Commit message:
Loosen a few more timeouts in tests

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

These can go wrong if the test runner is somewhat slow.

See https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/390870 for a previous iteration of this.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:loosen-more-test-timeouts into launchpad:master.
diff --git a/lib/lp/archivepublisher/tests/test_publishdistro.py b/lib/lp/archivepublisher/tests/test_publishdistro.py
index ae9a1b3..66bab77 100644
--- a/lib/lp/archivepublisher/tests/test_publishdistro.py
+++ b/lib/lp/archivepublisher/tests/test_publishdistro.py
@@ -59,7 +59,7 @@ from lp.testing.layers import ZopelessDatabaseLayer
 class TestPublishDistro(TestNativePublishingBase):
     """Test the publish-distro.py script works properly."""
 
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def runPublishDistro(self, extra_args=None, distribution="ubuntutest"):
         """Run publish-distro without invoking the script.
diff --git a/lib/lp/testing/tests/test_html5browser.py b/lib/lp/testing/tests/test_html5browser.py
index 240b618..48db456 100644
--- a/lib/lp/testing/tests/test_html5browser.py
+++ b/lib/lp/testing/tests/test_html5browser.py
@@ -215,7 +215,7 @@ class BrowserTestCase(TestCase):
         script = (
             "document.body.innerHTML = '<p>pting</p>';"
             "window.status = '::::' + document.body.innerText;")
-        command = browser.run_script(script, timeout=1000)
+        command = browser.run_script(script, timeout=5000)
         self.assertEqual(Command.STATUS_COMPLETE, command.status)
         self.assertEqual(Command.CODE_SUCCESS, command.return_code)
         self.assertEqual('pting', command.content)
@@ -228,6 +228,6 @@ class BrowserTestCase(TestCase):
         script = (
             "console.log('hello');"
             "window.status = '::::goodbye;'")
-        browser.run_script(script, timeout=1000)
+        browser.run_script(script, timeout=5000)
         self.assertTrue(
             browser._on_console_message(browser, 'message', 1, None, None))