Merge lp:~thumper/launchpad/fix-features into lp:launchpad

[Tim Penhey]

Explicitly flush the store when adding feature flags, and stop our tests from checking features for timeouts.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-10-26 15:47:24 +0000
+++ lib/lp/testing/__init__.py	2010-11-02 03:47:19 +0000
@@ -107,6 +107,7 @@
     canonical_url,
     errorlog,
     )
+from canonical.launchpad.webapp.adapter import set_permit_timeout_from_features
 from canonical.launchpad.webapp.errorlog import ErrorReportEvent
 from canonical.launchpad.webapp.interaction import ANONYMOUS
 from canonical.launchpad.webapp.servers import (
@@ -495,6 +496,7 @@
         self.oopses = []
         self.useFixture(ZopeEventHandlerFixture(self._recordOops))
         self.addCleanup(self.attachOopses)
+        set_permit_timeout_from_features(False)
 
     @adapter(ErrorReportEvent)
     def _recordOops(self, event):
@@ -992,7 +994,10 @@
     assert getattr(features.per_thread, 'features', None) is not None
     flag = FeatureFlag(
         scope=scope, flag=name, value=value, priority=priority)
-    getFeatureStore().add(flag)
+    store = getFeatureStore()
+    store.add(flag)
+    # Make sure that the feature is saved into the db right now.
+    store.flush()
 
 
 def validate_mock_class(mock_class):