Changeset 2384 in products

Timestamp:

May 25, 2010 6:17:59 PM (14 years ago)

Author:

mylan

Message:

#250: Fixed and added test for reinstallation

Location:

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps

Files:

• Extensions/Install.py (modified) (3 diffs)
• tests/testUpgrade.py (modified) (4 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/Extensions/Install.py

@@ +1 @@
+import logging
 from Products.CMFCore.utils import getToolByName
 from Products.GenericSetup.upgrade import _upgrade_registry
 
+logger = logging.getLogger("quintagroup.plonegooglesitemaps")
 PROFILE = "profile-quintagroup.plonegooglesitemaps:default"
 
@@ -16 +18 @@
         step = None
         profile_id = 'quintagroup.plonegooglesitemaps:default'
-        steps_to_run = [s['id'] for s in setup_tool.listUpgrades(profile_id, show_old=False)]
+        steps_to_run = [s['id'] for s in ps.listUpgrades(profile_id, show_old=False)]
         for step_id in steps_to_run:
             step = _upgrade_registry.getUpgradeStep(profile_id, step_id)
-            step.doStep(setup_tool)
+            step.doStep(ps)
             msg = "Ran upgrade step %s for profile %s" % (step.title, profile_id)
             logger.log(logging.INFO, msg)
@@ -25 +27 @@
         # with running an upgrade step.
         if step and step.dest is not None and step.checker is None:
-           setup_tool.setLastVersionForProfile(profile_id, step.dest)
+           ps.setLastVersionForProfile(profile_id, step.dest)
         return "Ran all reinstall steps."
 

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testUpgrade.py

@@ -6 +6 @@
 from Products.CMFPlone.utils import _createObjectByType
 from Products.GenericSetup.upgrade import _upgrade_registry
+from quintagroup.plonegooglesitemaps import config
+from quintagroup.plonegooglesitemaps import upgrades as gsm_upgrades
 from quintagroup.canonicalpath.interfaces import ICanonicalPath
 from quintagroup.canonicalpath.interfaces import ICanonicalLink
@@ -43 +45 @@
         if step is not None:
             step.doStep(self.setup)
-        # canonical_path column must be added to portal_catalog
+        # Canonical_path column must be added to portal_catalog
         self.assertEqual("canonical_path" in catalog._catalog.names, True)
 
@@ -68 +70 @@
         self.assertEqual(brain.canonical_link, migrated_link)
 
+    def testUpgradeCallOnReinstall(self):
+        # Get upgrade steps
+        upgrades = _upgrade_registry.getUpgradeStepsForProfile(self.profile)
+        upgrades = dict([(u.sortkey, u) for u in upgrades.values()])
+        try:
+            # Replace original handlers with patched ones for test calls
+            called = []
+            upgrades[1].handler = lambda st:called.append("1.0 to 1.1")
+            upgrades[2].handler = lambda st:called.append("1.1 to 1.2")
+            # Run reinstallation
+            self.portal.portal_quickinstaller.reinstallProducts(products=config.PROJECTNAME)
+            # Test upgrades call
+            self.assertEqual("1.0 to 1.1" in called, True)
+            self.assertEqual("1.1 to 1.2" in called, True)
+        finally:
+            # Restore original upgrade handlers
+            upgrades[1].handler = gsm_upgrades.upgrade_1_0_to_1_1
+            upgrades[2].handler = gsm_upgrades.upgrade_1_1_to_1_2
+
+        
 
 def test_suite():
@@ -77 +99 @@
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-#    framework()