gtri#2: combine tests and combine

bollwyvl · Feb 3, 2019 · fb95198 · fb95198
1 parent bf75c6b
commit fb95198
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/ci/job.combine.yml b/ci/job.combine.yml
@@ -30,7 +30,7 @@ jobs:
         inputs:
           artifactName: Test Output Windows
           targetPath: _testoutput
-      - script: python -m scripts.combine
+      - script: python -m scripts.test combine
         condition: always()
         displayName: Rebot
       - task: PublishBuildArtifacts@1

diff --git a/scripts/combine.py b/scripts/combine.py
diff --git a/scripts/test.py b/scripts/test.py
@@ -140,7 +140,19 @@ def acceptance(robot_args):
 
 
 def combine(rebot_args):
-    run(["python", "-m", "scripts.combine"] + rebot_args)
+    args = [
+        "python",
+        "-m",
+        "robot.rebot",
+        "--name",
+        "IRobotFramework",
+        "--outputdir",
+        str(TEST_OUT / "robot"),
+        "--output",
+        "index.xml",
+    ] + rebot_args + list(map(str, (TEST_OUT / "robot").glob("*.xml")))
+
+    return run(args)
 
 
 TESTS = [