[Checkins] SVN: gocept.selenium/trunk/src/gocept/selenium/plonetesting/ Pull in FUNCTIONAL_TESTING (DemoStorage stacking) in the plonetesting.Layer, since it is always needed for testing with selenium

[Wolfgang Schnerring]

Log message for revision 119185:
  Pull in FUNCTIONAL_TESTING (DemoStorage stacking) in the plonetesting.Layer, since it is always needed for testing with selenium
  
  

Changed:
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/__init__.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py

-=-
Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/__init__.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/__init__.py	2010-12-28 09:45:14 UTC (rev 119184)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/__init__.py	2010-12-28 10:09:03 UTC (rev 119185)
@@ -26,7 +26,7 @@
 
 class Layer(gocept.selenium.base.Layer, plone.testing.Layer):
 
-    defaultBases = (ZSERVER,)
+    defaultBases = (ZSERVER, plone.testing.z2.FUNCTIONAL_TESTING)
 
     def __init__(self, *args, **kw):
         # we can't use super, since our base classes are not built for multiple

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py	2010-12-28 09:45:14 UTC (rev 119184)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py	2010-12-28 10:09:03 UTC (rev 119185)
@@ -27,13 +27,10 @@
             'testing.zcml', package=gocept.selenium.plonetesting.tests,
             context=self['configurationContext'])
 
+
 ISOLATION = Isolation()
 
-FUNCTIONAL_ISOLATION = plone.testing.z2.FunctionalTesting(
-    bases=(ISOLATION,),
-    name='FunctionalIsolation')
 
-
 class IsolationTestHelper(object):
     """
     plone.testing implementation of methods needed by common isolation tests

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py	2010-12-28 09:45:14 UTC (rev 119184)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py	2010-12-28 10:09:03 UTC (rev 119185)
@@ -23,21 +23,18 @@
 import unittest
 
 
-PLONE_ISOLATION = plone.testing.z2.FunctionalTesting(
-    bases=(gocept.selenium.plonetesting.testing.ISOLATION,
+layer = plone.testing.Layer(
+    bases=(gocept.selenium.plonetesting.SELENIUM,
+           gocept.selenium.plonetesting.testing.ISOLATION,
            plone.app.testing.layers.PLONE_FIXTURE),
-    name="gocept.selenium:PloneIsolation")
+    name='layer')
 
-PLONE_SELENIUM = plone.testing.Layer(
-    bases=(gocept.selenium.plonetesting.SELENIUM, PLONE_ISOLATION,),
-    name="gocept.selenium:Plone3")
 
-
 class Plone3Tests(gocept.selenium.tests.isolation.IsolationTests,
                   gocept.selenium.plonetesting.testing.IsolationTestHelper,
                   gocept.selenium.plonetesting.TestCase):
 
-    layer = PLONE_SELENIUM
+    layer = layer
 
     def test_plone_login(self):
         sel = self.selenium

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py	2010-12-28 09:45:14 UTC (rev 119184)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py	2010-12-28 10:09:03 UTC (rev 119185)
@@ -23,21 +23,18 @@
 import unittest
 
 
-PLONE_ISOLATION = plone.testing.z2.FunctionalTesting(
-    bases=(gocept.selenium.plonetesting.testing.ISOLATION,
+layer = plone.testing.Layer(
+    bases=(gocept.selenium.plonetesting.SELENIUM,
+           gocept.selenium.plonetesting.testing.ISOLATION,
            plone.app.testing.layers.PLONE_FIXTURE),
-    name="gocept.selenium:PloneIsolation")
+    name='layer')
 
-PLONE_SELENIUM = plone.testing.Layer(
-    bases=(gocept.selenium.plonetesting.SELENIUM, PLONE_ISOLATION,),
-    name="gocept.selenium:Plone4")
 
-
 class Plone4Tests(gocept.selenium.tests.isolation.IsolationTests,
                   gocept.selenium.plonetesting.testing.IsolationTestHelper,
                   gocept.selenium.plonetesting.TestCase):
 
-    layer = PLONE_SELENIUM
+    layer = layer
 
     def test_plone_login(self):
         sel = self.layer['selenium']

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py	2010-12-28 09:45:14 UTC (rev 119184)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py	2010-12-28 10:09:03 UTC (rev 119185)
@@ -19,17 +19,17 @@
 import unittest
 
 
-ZOPE2_ISOLATION = plone.testing.Layer(
+layer = plone.testing.Layer(
     bases=(gocept.selenium.plonetesting.SELENIUM,
-           gocept.selenium.plonetesting.testing.FUNCTIONAL_ISOLATION,),
-    name="gocept.selenium:Zope2")
+           gocept.selenium.plonetesting.testing.ISOLATION,),
+    name='layer')
 
 
 class Zope2Tests(gocept.selenium.tests.isolation.IsolationTests,
                  gocept.selenium.plonetesting.testing.IsolationTestHelper,
                  gocept.selenium.plonetesting.TestCase):
 
-    layer = ZOPE2_ISOLATION
+    layer = layer
 
 
 def test_suite():