Exclude non-Windows and non-ipy tests automatically

Author: pekkaklarck

test/atest/stopping.robot

@@ -8,16 +8,16 @@ Stop Remote Server
     Stop Remote Server
 
 SIGINT
-    Skip On Windows
-    Send Signal To Remote Server    SIGINT
+    [Tags]    no-windows
+    Send Signal To Process    SIGINT
 
 SIGHUP
-    Skip On Windows
-    Send Signal To Remote Server    SIGHUP
+    [Tags]    no-windows
+    Send Signal To Process    SIGHUP
 
 SIGTERM
-    Skip On Windows
-    Send Signal To Remote Server    SIGTERM
+    [Tags]    no-windows
+    Send Signal To Process    SIGTERM
 
 *** Keywords ***
 Start Server
@@ -28,17 +28,7 @@ Server Should Be Started
     Run Keyword    ${TEST NAME}.Passing
 
 Server Should Be Stopped
-    Return From Keyword If    "skip" in @{TEST TAGS}
     Server Should Be Stopped And Correct Messages Logged
     Run Keyword And Expect Error    Connection to remote server broken: *
     ...    Server Should Be Started
     [Teardown]    Run Keyword And Ignore Error    ${TEST NAME}.Stop Remote Server
-
-Skip On Windows
-    Run Keyword If    "${:}" == ";"    Fail    Skipped on Windows    skip
-
-Send Signal To Remote Server
-   [Arguments]     ${signal}
-   [Documentation]  Send signal to server, not to possible wrapper (e.g. jython) running it.
-   ${pid}=   Run Keyword    ${TEST NAME}.Get PID
-   Evaluate   os.kill(${pid}, signal.${signal})   os,signal

test/run.py

@@ -26,8 +26,8 @@
 from __future__ import print_function
 
 from os.path import abspath, dirname, exists, join
-from os import mkdir
-from shutil import rmtree
+import os
+import shutil
 import shlex
 import sys
 import subprocess
@@ -46,8 +46,8 @@
 arguments = sys.argv[2:]
 
 if exists(results):
-    rmtree(results)
-mkdir(results)
+    shutil.rmtree(results)
+os.mkdir(results)
 
 if not arguments:
     print('Running unit tests with "%s".' % interpreter)
@@ -59,11 +59,18 @@
         sys.exit(rc)
     arguments = [join(curdir, 'atest')]
 
-command = ['python', '-m', 'robot.run',
-           '--variable', 'INTERPRETER:%s' % interpreter,
-           '--doc', 'Remote server tests on "%s"' % interpreter,
-           '--metadata', 'Server_Interpreter:%s' % interpreter,
-           '--output', output, '--log', 'NONE', '--report', 'NONE'] + arguments
+excludes = []
+if os.sep == '\\':
+    excludes.extend(['--exclude', 'no-windows'])
+if 'ipy' in interpreter:
+    excludes.extend(['--exclude', 'no-ipy'])
+command = [
+    'python', '-m', 'robot.run',
+    '--variable', 'INTERPRETER:%s' % interpreter,
+    '--doc', 'Remote server tests on "%s"' % interpreter,
+    '--metadata', 'Server_Interpreter:%s' % interpreter,
+    '--output', output, '--log', 'NONE', '--report', 'NONE'
+] + excludes + arguments
 print('Running acceptance tests with command:\n%s' % ' '.join(command))
 rc = subprocess.call(command)
 print()