pythonthings
diff --git a/‎atest/tests/resource.robot‎
Lines changed: 7 additions & 3 deletions b/‎atest/tests/resource.robot‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎src/robotremoteserver.py‎
Lines changed: 2 additions & 2 deletions b/‎src/robotremoteserver.py‎
Lines changed: 2 additions & 2 deletions
@@ -12,6 +12,7 @@ Start And Import Remote Library
     Set Pythonpath
     ${port} =    Start Remote Library    ${library}
     Import Library    Remote    http://127.0.0.1:${port}
+    Set Suite Variable    ${ACTIVE PORT}    ${port}
     Set Log Level    DEBUG
 
 Start Remote Library
@@ -36,7 +37,10 @@ Set Pythonpath
     Set Environment Variable    IRONPYTHONPATH    ${src}
 
 Stop Remote Library
-    [Arguments]    ${library}=${NONE}
     Stop Remote Server
-    ${result} =    Wait For Process    ${library}    10s    terminate
-    Log    ${result.stdout}
+    Server Should Be Stopped And Correct Messages Logged
+
+Server Should Be Stopped And Correct Messages Logged
+    ${result} =    Wait For Process    timeout=10s    on_timeout=terminate
+    Should Be Equal    ${result.stdout}
+    ...    Robot Framework remote server starting at 127.0.0.1:${ACTIVE PORT}.
@@ -85,10 +85,10 @@ def serve_forever(self):
     def stop_remote_server(self):
         prefix = 'Robot Framework remote server at %s:%s ' % self.server_address
         if self._allow_stop:
-            self._log(prefix + 'stopping')
+            self._log(prefix + 'stopping.')
             self._shutdown = True
         else:
-            self._log(prefix + 'does not allow stopping', 'WARN')
+            self._log(prefix + 'does not allow stopping.', 'WARN')
         return True
 
     def get_keyword_names(self):