Merge lp:~jtv/launchpad/buildfail-recipebuilder into lp:launchpad

[Jeroen T. Vermeulen]

[r=adeuring][ui=none][no-qa] Fix spurious test failure in test_message_sharing_migration.

This fixes spurious failures in one test, test_messagesCanStayDiverged. It also cleans up the test a bit, but the main thing is that just a switchDbUser apparently isn't always good enough. lp.testing.TestCase.becomeDbUser also throws in a commit, and that's what does the trick.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/translations/scripts/tests/test_message_sharing_migration.py'
--- lib/lp/translations/scripts/tests/test_message_sharing_migration.py	2010-10-05 00:08:16 +0000
+++ lib/lp/translations/scripts/tests/test_message_sharing_migration.py	2010-11-19 11:06:31 +0000
@@ -18,6 +18,7 @@
     record_statements,
     TestCaseWithFactory,
     )
+from lp.testing.sampledata import ADMIN_EMAIL
 from lp.translations.interfaces.pofiletranslator import IPOFileTranslatorSet
 from lp.translations.model.pomsgid import POMsgID
 from lp.translations.model.potemplate import POTemplate
@@ -62,8 +63,8 @@
         # This test needs the privileges of rosettaadmin (to delete
         # POTMsgSets) but it also needs to set up test conditions which
         # requires other privileges.
-        self.layer.switchDbUser('postgres')
-        super(TestPOTMsgSetMerging, self).setUp(user='[e-mail]')
+        super(TestPOTMsgSetMerging, self).setUp(user=ADMIN_EMAIL)
+        self.becomeDbUser('postgres')
         super(TestPOTMsgSetMerging, self).setUpProduct()
 
     def test_matchedPOTMsgSetsShare(self):
@@ -252,9 +253,9 @@
         The matching POTMsgSets will be merged by the _mergePOTMsgSets
         call.
         """
-        self.layer.switchDbUser('postgres')
         super(TestPOTMsgSetMergingAndTranslations, self).setUp(
-            user='[e-mail]')
+            user=ADMIN_EMAIL)
+        self.becomeDbUser('postgres')
         super(TestPOTMsgSetMergingAndTranslations, self).setUpProduct()
 
     def test_sharingDivergedMessages(self):
@@ -374,9 +375,8 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        self.layer.switchDbUser('postgres')
-        super(TestTranslationMessageNonMerging, self).setUp(
-            user='[e-mail]')
+        super(TestTranslationMessageNonMerging, self).setUp(user=ADMIN_EMAIL)
+        self.becomeDbUser('postgres')
         super(TestTranslationMessageNonMerging, self).setUpProduct()
 
     def test_MessagesAreNotSharedAcrossPOTMsgSets(self):
@@ -402,9 +402,8 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        self.layer.switchDbUser('postgres')
-        super(TestTranslationMessageMerging, self).setUp(
-            user='[e-mail]')
+        super(TestTranslationMessageMerging, self).setUp(user=ADMIN_EMAIL)
+        self.becomeDbUser('postgres')
         super(TestTranslationMessageMerging, self).setUpProduct()
 
     def test_messagesCanStayDiverged(self):
@@ -565,8 +564,8 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        self.layer.switchDbUser('postgres')
-        super(TestRemoveDuplicates, self).setUp(user='[e-mail]')
+        super(TestRemoveDuplicates, self).setUp(user=ADMIN_EMAIL)
+        self.becomeDbUser('postgres')
         super(TestRemoveDuplicates, self).setUpProduct()
 
     def test_duplicatesAreCleanedUp(self):
@@ -735,8 +734,8 @@
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
-        self.layer.switchDbUser('postgres')
         super(TestSharingMigrationPerformance, self).setUp()
+        self.becomeDbUser('postgres')
         super(TestSharingMigrationPerformance, self).setUpProduct()
 
     def _flushDbObjects(self):