Merge branch 'volto_3294' into volto_3294_new_fixture

src/plone/app/robotframework/server.py

@@ -316,6 +316,7 @@ def zodb_setup(self, layer_dotted_name=None):
         from zope.testrunner.runner import order_by_bases
 
         layers = order_by_bases([self.zope_layer])
+        print(WAIT(layers))
         for layer in layers:
             if hasattr(layer, "testSetUp"):
                 if HAS_VERBOSE_CONSOLE:

src/plone/app/robotframework/testing.py

@@ -10,6 +10,7 @@
 from plone.app.robotframework.remote import RemoteLibraryLayer
 from plone.app.robotframework.server import Zope2ServerRemote
 from plone.app.robotframework.users import Users
+from plone.app.robotframework.server import WAIT
 from plone.app.testing import applyProfile
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
@@ -137,30 +138,6 @@ def tearDown(self):
 #     />
 #
 
-class TestScopeWSGIServer(WSGIServer):
-
-    # Layer where WSGI server is shutdown on testTearDown to prevent requests
-    # being processed between tests (which could lead to unexpected database
-    # state).
-
-    # Still starts with WSGI server being started at first on suite setUp
-    # for convenience and similar "RobotServer" experience to the default
-    # layer.
-
-    def testSetUp(self):
-        if hasattr(self, "server") and self.server.was_shutdown:
-            super(TestScopeWSGIServer, self).setUp()
-
-    def tearDown(self):
-        pass
-
-    def testTearDown(self):
-        super(TestScopeWSGIServer, self).tearDown()
-
-
-TEST_SCOPE_WSGI_SERVER_FIXTURE = TestScopeWSGIServer()
-
-
 RobotRemote = type(
     "RobotRemote",
     (
@@ -306,6 +283,45 @@ def __nonzero__(x):
     name="PloneRobot:Integration",
 )
 
+
+class WSGIServerTestScope(WSGIServer):
+
+    # Layer where WSGI server is shutdown on testTearDown to prevent requests
+    # being processed between tests (which could lead to unexpected database
+    # state).
+
+    # Still starts with WSGI server being started at first on suite setUp
+    # for convenience and similar "RobotServer" experience to the default
+    # layer.
+
+    bases = (PLONE_FIXTURE,)
+
+    def setUp(self):
+        print(WAIT("WSGIServerTestScope:setUp"))
+        super(WSGIServerTestScope, self).setUp()
+
+    def testSetUp(self):
+        print(WAIT("WSGIServerTestScope:testSetUp"))
+        if hasattr(self, "server") and self.server.was_shutdown:
+            super(WSGIServerTestScope, self).setUp()
+
+    def tearDown(self):
+        print(WAIT("WSGIServerTestScope:tearDown"))
+        pass
+
+    def testTearDown(self):
+        print(WAIT("WSGIServerTestScope:testTearDown"))
+        super(WSGIServerTestScope, self).tearDown()
+        # Try to wait until server no longer responds.
+        if hasattr(self, "server"):
+            for i in range(10):
+                # There is implicit 0.3 second sleep per try.
+                if not self.server.wait(0):
+                    return
+
+
+WSGI_SERVER_TEST_SCOPE_FIXTURE = WSGIServerTestScope()
+
 PLONE_ROBOT_TESTING = FunctionalTesting(
     bases=(
         PLONE_ROBOT_FIXTURE,