← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~wgrant/launchpad/bump-opstats-test-timeouts into lp:launchpad

 

William Grant has proposed merging lp:~wgrant/launchpad/bump-opstats-test-timeouts into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #724718 xx-opstats.txt failing occasionally
  https://bugs.launchpad.net/bugs/724718

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/bump-opstats-test-timeouts/+merge/51249

r12457 broke xx-opstats.txt in ec2: traversal to +opstats now performs a feature flag query, which sometimes falls afoul of the 1ms statement timeout set by the test. This branch pops the config before requesting +opstats, giving it a less unreasonable interval within which it must complete.
-- 
https://code.launchpad.net/~wgrant/launchpad/bump-opstats-test-timeouts/+merge/51249
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/bump-opstats-test-timeouts into lp:launchpad.
=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2011-02-17 16:54:08 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2011-02-25 04:26:16 +0000
@@ -180,6 +180,8 @@
     ... """)
     >>> output.getStatus()
     503
+    >>> # Reset the timeouts so +opstat doesn't die.
+    >>> base_test_data = config.pop('base_test_data')
     >>> report()
     503s: 1
     5XXs: 1
@@ -187,10 +189,6 @@
     requests: 1
     timeouts: 1
 
-Reset our config until Bug 78545 is fixed:
-
-    >>> base_test_data = config.pop('base_test_data')
-
 
 == HTTP access for Cricket ==