Ignore:
Timestamp:
Jun 18, 2010 9:43:41 AM (14 years ago)
Author:
mylan
Message:

Merged plone4 branch into trunk : revisions 3588-3592 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.plonegooglesitemaps/branches/plone4

........

r3588 | mylan | 2010-06-17 17:57:02 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Fix 'ValueError?: Product factory for Sitemap was invalid' error in tests.

........

r3589 | mylan | 2010-06-17 19:13:57 +0300 (Thu, 17 Jun 2010) | 1 line


#130: updated configlet templates - added plone4 related globals

........

r3590 | mylan | 2010-06-17 20:10:17 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Fixed absence of tabindex in pagetemplates

........

r3591 | mylan | 2010-06-17 20:58:49 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Fixed breakage on testing upgrades

........

r3592 | mylan | 2010-06-17 21:05:56 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Updated history

........

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo

      •  

        old new  
         1/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
        12/quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536 
    • Property svnmerge-integrated changed from /quintagroup.plonegooglesitemaps/branches/plone4:1-3587 /quintagroup.plonegooglesitemaps/branches/test_refactoring:1-3576 to /quintagroup.plonegooglesitemaps/branches/test_refactoring:1-3576 /quintagroup.plonegooglesitemaps/branches/plone4:1-3593

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

    r2538 r2555  
    117117        upgrades = _upgrade_registry.getUpgradeStepsForProfile(self.profile) 
    118118        upgrades = dict([(u.sortkey, u) for u in upgrades.values()]) 
     119        orig_ver = self.setup.getLastVersionForProfile(self.profile) 
     120        self.setup.setLastVersionForProfile(self.profile, "") 
    119121        try: 
    120122            # Replace original handlers with patched ones for test calls 
    … …  
    134136            upgrades[2].handler = gsm_upgrades.upgrade_1_1_to_1_2 
    135137            upgrades[3].handler = gsm_upgrades.upgrade_1_2_to_1_3 
     138            self.setup.setLastVersionForProfile(self.profile, orig_ver) 
    136139 
    137140         
Note: See TracChangeset for help on using the changeset viewer.