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

[Tim Penhey]

Fix TestSharingMigrationPerformance to not call gc.get_objects().

Fix the lp.translations.scripts.tests.test_message_sharing_migration.TestSharingMigrationPerformance test to not use gc.get_objects() as this interacts badly with bzrlib lazy imports.

The test is also a little more explicit.

[Robert Collins (lifeless)]

Its also a very expensive function to call. This is much more appropriate.

Small nit:
+from lp.testing import (
+ record_statements,
+ TestCaseWithFactory)

should be
+from lp.testing import (
+ record_statements,
+ TestCaseWithFactory,
+ )

as per the list policy in the wiki.

review: Approve

=== modified file 'lib/lp/translations/scripts/tests/test_message_sharing_migration.py'
--- lib/lp/translations/scripts/tests/test_message_sharing_migration.py	2009-11-27 12:50:16 +0000
+++ lib/lp/translations/scripts/tests/test_message_sharing_migration.py	2010-08-17 02:31:46 +0000
@@ -13,7 +13,10 @@
 from zope.security.proxy import removeSecurityProxy
 
 from lp.services.worlddata.interfaces.language import ILanguageSet
-from lp.testing import TestCaseWithFactory
+from lp.testing import (
+    record_statements,
+    TestCaseWithFactory,
+    )
 from lp.translations.interfaces.pofiletranslator import (
     IPOFileTranslatorSet)
 from lp.translations.model.pomsgid import POMsgID
@@ -742,22 +745,6 @@
         transaction.commit()
         gc.collect()
 
-    def _listLoadedObjects(self, of_class, ignore_list=None):
-        """Return the set of objects of a given type that are in memory.
-
-        :param of_class: A class to filter for.
-        :param ignore_list: A previous return value.  Any POMsgIDs that
-            were already in that list are ignored here.
-        """
-        pomsgids = set([
-            whatever
-            for whatever in gc.get_objects()
-            if isinstance(whatever, of_class)
-            ])
-        if ignore_list is not None:
-            pomsgids -= ignore_list
-        return pomsgids
-
     def _resetReferences(self):
         """Reset translation-related references in the test object.
 
@@ -782,50 +769,31 @@
 
         self.templates = [POTemplate.get(id) for id in template_ids]
 
-    def test_merging_loads_no_msgids(self):
-        # Migration does not load actual msgids into memory.
-        self._flushDbObjects()
-        msgids_before = self._listLoadedObjects(POMsgID)
-
-        self._makeTranslationMessages('x', 'y', trunk_diverged=True)
-        self._makeTranslationMessages('1', '2', stable_diverged=True)
-
-        self._resetReferences()
-        self.assertNotEqual([], self.templates)
-        self.assertEqual(
-            set(), self._listLoadedObjects(POMsgID, msgids_before))
-        
-        self.script._mergePOTMsgSets(self.templates)
-        self.script._mergeTranslationMessages(self.templates)
-
-        self.assertEqual(
-            set(), self._listLoadedObjects(POMsgID, msgids_before))
-
-    def test_merging_loads_no_potranslations(self):
-        # Migration does not load actual POTranslations into memory.
-        self._flushDbObjects()
-        potranslations_before = self._listLoadedObjects(POTranslation)
-
-        self._makeTranslationMessages('x', 'y', trunk_diverged=True)
-        self._makeTranslationMessages('1', '2', stable_diverged=True)
-
-        self._resetReferences()
-        self.assertNotEqual([], self.templates)
-        self.assertEqual(
-            set(),
-            self._listLoadedObjects(POTranslation, potranslations_before))
-        
-        self.script._mergePOTMsgSets(self.templates)
-
-        self.assertEqual(
-            set(),
-            self._listLoadedObjects(POTranslation, potranslations_before))
-        
-        self.script._mergeTranslationMessages(self.templates)
-
-        self.assertEqual(
-            set(),
-            self._listLoadedObjects(POTranslation, potranslations_before))
+    def assertNoStatementsInvolvingTable(self, table_name, statements):
+        """The specified table name is not in any of the statements."""
+        table_name = table_name.upper()
+        self.assertFalse(
+            any([table_name in statement.upper()
+                 for statement in statements]))
+
+    def test_merging_loads_no_msgids_or_potranslations(self):
+        # Migration does not touch the POMsgID or POTranslation tables.
+        self._makeTranslationMessages('x', 'y', trunk_diverged=True)
+        self._makeTranslationMessages('1', '2', stable_diverged=True)
+        self._resetReferences()
+        self.assertNotEqual([], self.templates)
+
+        _ignored, statements = record_statements(
+            self.script._mergePOTMsgSets, self.templates)
+        self.assertNoStatementsInvolvingTable(POMsgID._table, statements)
+        self.assertNoStatementsInvolvingTable(
+            POTranslation._table, statements)
+
+        _ignored, statements = record_statements(
+            self.script._mergeTranslationMessages, self.templates)
+        self.assertNoStatementsInvolvingTable(POMsgID._table, statements)
+        self.assertNoStatementsInvolvingTable(
+            POTranslation._table, statements)
 
 
 def test_suite():