test fixes

plone · Apr 1, 2014 · eb02c23 · eb02c23
1 parent 3b3246e
commit eb02c23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/plone/app/vocabularies/testing.py b/plone/app/vocabularies/testing.py
@@ -1,7 +1,10 @@
+from Products.CMFPlone.utils import getFSVersionTuple
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import PLONE_FIXTURE
 from plone.app.testing import PloneSandboxLayer
 
+PLONE5 = getFSVersionTuple()[0] >= 5
+
 
 class PAVocabulariesLayer(PloneSandboxLayer):
     defaultBases = (PLONE_FIXTURE,)
@@ -14,6 +17,11 @@ def setUpZope(self, app, configurationContext):
             context=configurationContext
         )
 
+    def setUpPloneSite(self, portal):
+        if not PLONE5:
+            self.applyProfile(portal, 'plone.app.event:default')
+            set_timezone(tz='UTC')
+
 
 PAVocabularies_FIXTURE = PAVocabulariesLayer()
 PAVocabularies_INTEGRATION_TESTING = IntegrationTesting(

diff --git a/plone/app/vocabularies/tests/test_timezonevocabularies.py b/plone/app/vocabularies/tests/test_timezonevocabularies.py
@@ -11,6 +11,7 @@ class TimezoneTest(unittest.TestCase):
 
     def setUp(self):
         self.portal = self.layer['portal']
+        reg = getUtility(IRegistry)
 
     def test_timezone_vocabulary(self):
         tzvocab = getUtility(IVocabularyFactory, 'plone.app.vocabularies.Timezones')
@@ -30,8 +31,8 @@ def test_available_timezones_vocabulary(self):
         # this is for Plone 4.3
         reg_key = 'plone.available_timezones'
         if reg_key not in reg:
-            # else use 'plone.app.event.available_timezones'
-            reg_key = "plone.app.event.available_timezones"
+            # this works only for plone.app.event 2.0
+            return
 
         # initially, all common zones are available in AvailableTimezones
         common_zones_vocab = getUtility(