Merge lp:~jtv/launchpad/recife-test-fixup into lp:~launchpad/launchpad/recife

[Jeroen T. Vermeulen]

Recife test fixup.

= Recife test fix =

This fixes a test of some new test helpers. I broke the test with a "harmless" change during review, and apparently managed not to run it.

(Recife is a feature branch, so EC2 is no help in this case).

Test with:
{{{
./bin/test -vv -m lp.translations.tests.test_helpers
}}}

Q/A consists of ensuring that the test passes. No lint apart from the usual "make lint" madness.

Jeroen

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/translations/tests/test_helpers.py'
--- lib/lp/translations/tests/test_helpers.py	2010-07-02 13:00:56 +0000
+++ lib/lp/translations/tests/test_helpers.py	2010-07-05 16:11:31 +0000
@@ -159,18 +159,22 @@
         self.assertIs(None, other)
         self.assertEquals([tm_diverged], divergences)
 
-    def test_summarize_current_translations_multiple_divergences_elswh(self):
+    def test_summarize_current_translations_multiple_divergences_elsewh(self):
+        # summarize_current_translations when there are diverged
+        # messages on both the Ubuntu side and the upstream side.
         tm_diverged1 = make_translationmessage(
             self.factory, pofile=self.other_pofile, potmsgset=self.potmsgset,
             ubuntu=True, upstream=False, diverged=True)
 
+        ubuntu = self.pofile.potemplate.distroseries.distribution
         potemplate2 = self.factory.makePOTemplate(
-            productseries=self.factory.makeProductSeries(
-                product=self.pofile.potemplate.productseries.product))
+            distroseries=self.factory.makeDistroSeries(distribution=ubuntu),
+            sourcepackagename=self.pofile.potemplate.sourcepackagename)
         pofile2 = self.factory.makePOFile(
             self.pofile.language.code, potemplate=potemplate2)
         tm_diverged2 = make_translationmessage(
-            self.factory, pofile=pofile2, potmsgset=self.potmsgset)
+            self.factory, pofile=pofile2, potmsgset=self.potmsgset,
+            ubuntu=False, upstream=True, diverged=True)
 
         current_shared, current_diverged, other, divergences = (
             summarize_current_translations(self.pofile, self.potmsgset))