fixed and improved test logic and process handling in test/remote/

--HG--
branch : dev

Author: userzimmermann

test/remote/conftest.py

@@ -1,9 +1,11 @@
 import sys
+from six import PY2
 from textwrap import dedent
 from subprocess import Popen
 
+from robot.errors import DataError
+
 from robottools import TestRobot
-from robottools.remote import RemoteRobot
 
 import pytest
 
@@ -24,7 +26,8 @@ def process(request):
     """Creates an external python process with a ``RemoteRobot`` instance
     loading all libraries defined in ``REMOTE_LIBRARIES``.
     """
-    return Popen([
+    # robotremoteserver is not PY3-compatible yet
+    return PY2 and Popen([
         sys.executable, '-c', dedent("""
         __import__('robottools.remote').remote.RemoteRobot(
             [%s], allow_import=[%s]
@@ -38,6 +41,14 @@ def robot_Remote(request):
     which automatically connects to the external ``RemoteRobot`` instance
     created in ``process`` fixture.
     """
-    robot = TestRobot('Test')
-    robot.Import('Remote')
-    return robot
+    # make 3 connection attempts before bailing out
+    for _ in range(3):
+        try:
+            # BuiltIn will also be served by RemoteRobot
+            robot = TestRobot('Test', BuiltIn=False)
+            robot.Import('Remote')
+            return robot
+
+        except DataError:
+            continue
+    raise

test/remote/test_remote.py

@@ -1,7 +1,8 @@
-from six import text_type as unicode
+from six import PY3, text_type as unicode
 from time import sleep
 
 from decorator import decorate
+from moretools import isstring
 
 from robottools import TestRobot
 
@@ -14,6 +15,11 @@ def check_process(func):
     which is passed to every test method as ``process`` fixture.
     """
     def caller(func, self, process, *args, **kwargs):
+        cls = type(self)
+        # ensure that process was not recreated for some reason
+        if hasattr(cls, 'process'):
+            assert process is cls.process
+        cls.process = process
         # polling returns None as long as process is running
         assert process.poll() is None, \
             "RemoteRobot process is not running (anymore)."
@@ -57,7 +63,10 @@ def test_bytes_result(self, process, robot_Remote):
     def test_string_result(self, process, robot_Remote):
         for value in [1, 2.3, 'four', u'five']:
             result = robot_Remote.ConvertToString(value)
-            assert isinstance(result, unicode)
+            # not consistent in current PY2-only robotremoteserver
+            # (can be str or unicode):
+            # assert isinstance(result, unicode)
+            assert isstring(result)
             assert result == unicode(value)
 
     @check_process
@@ -74,3 +83,16 @@ def test_StopRemoteServer(self, process, robot_Remote):
         process.wait()
         # polling returns None as long as process is running
         assert process.poll() is not None
+
+    @classmethod
+    def teardown_class(cls):
+        """Ensures that the ``RemoteRobot`` process
+        is really terminated in the end.
+        """
+        if not cls.process.poll():
+            cls.process.terminate()
+
+
+if PY3:
+    # robotremoteserver is not PY3-compatible yet
+    del TestRemoteRobot