Merge lp:~henninge/launchpad/bug-612583-test-errors into lp:~launchpad/launchpad/recife

[Henning Eggers]

Fixed test errors after db-stable merge.

The bug 612583 failed to mention that these failures are related to a db-stable merge.

The KarmaRecorder was introduced in the recife branch. I don't know why is_published leaked into this again, but Hey!

[Данило Шеган (danilo)]

Looks good, thanks.

review: Approve (code)

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-07-27 11:31:46 +0000
+++ lib/lp/testing/__init__.py	2010-08-02 15:17:43 +0000
@@ -115,6 +115,7 @@
 from lp.testing._webservice import (
     launchpadlib_credentials_for, launchpadlib_for, oauth_access_token_for)
 from lp.testing.fixture import ZopeEventHandlerFixture
+from lp.testing.karma import KarmaRecorder
 
 # zope.exception demands more of frame objects than twisted.python.failure
 # provides in its fake frames.  This is enough to make it work with them

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-07-27 11:31:46 +0000
+++ lib/lp/testing/factory.py	2010-08-02 15:17:43 +0000
@@ -2086,7 +2086,7 @@
                                         sourcepackagename=None,
                                         distroseries=None,
                                         productseries=None, content=None,
-                                        uploader=None, is_published=False):
+                                        uploader=None, from_upstream=False):
         """Create a `TranslationImportQueueEntry`."""
         if path is None:
             path = self.getUniqueString() + '.pot'
@@ -2116,7 +2116,7 @@
             path=path, status=status, sourcepackagename=sourcepackagename,
             distroseries=distroseries, productseries=productseries,
             importer=uploader, content=content_reference,
-            is_published=is_published)
+            from_upstream=from_upstream)
 
     def makeMailingList(self, team, owner):
         """Create a mailing list for the team."""