gtri#2: keep tightening up scripts, etc

bollwyvl · Feb 2, 2019 · d2fbe9a · d2fbe9a
1 parent 36a7b69
commit d2fbe9a
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 114 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ envs/
 lib/
 node_modules/
 Untitled*.ipynb
+.coverage
diff --git a/anaconda-project.yml b/anaconda-project.yml
@@ -64,16 +64,14 @@ commands:
     unix: ipython --kernel-name robotframework
     env_spec: default
   test:
-    description: run all the tests
+    description: |
+      run all the tests or specify [l]int, [u]nit, [a]cceptance. extra args
+      passed to underlying scripts for unit and acceptance, while lint
+      accepts targets
     unix: python -m scripts.test
     env_spec: test
-  test:py:
-    description: run unit tests
-    unix: python -m scripts.test py
-    env_spec: test
-  test:robot:
-    description: run acceptance tests
-    unix: python -m scripts.test robot
+  t:
+    unix: python -m scripts.test
     env_spec: test
   test:release:
     unix: python -m scripts.release_check ${NEXT_RELEASE}

diff --git a/atest/acceptance/00_Smoke.robot b/atest/acceptance/00_Smoke.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Some quick tests to see if we broke the build somehow.
-Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}smoke
+Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}smoke
 Resource          ../resources/Lab.robot
 Resource          ../resources/Browser.robot
 

diff --git a/atest/acceptance/01_Python.robot b/atest/acceptance/01_Python.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Try out the python magics
-Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}python
+Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}python
 Default Tags      kernel:python    browser:${BROWSER}
 Resource          ../resources/Lab.robot
 Resource          ../resources/Browser.robot

diff --git a/atest/acceptance/02_Robot/00_Basic.robot b/atest/acceptance/02_Robot/00_Basic.robot
@@ -10,7 +10,7 @@ Library           SeleniumLibrary
 *** Test Cases ***
 Robot Test Case Notebook
     [Documentation]    Can we make a simple Robot Test notebook?
-    Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}robot${/}base
+    Set Screenshot Directory    ${OUTPUT_DIR}${/}robot${/}base
     Capture Page Screenshot    00_before.png
     Launch a new    Robot Framework    Notebook
     Capture Page Screenshot    01_new.png
@@ -21,7 +21,7 @@ Robot Test Case Notebook
 
 Robot Task Notebook
     [Documentation]    Can we make a simple Robot Process Automation notebook?
-    Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}robot${/}rpa
+    Set Screenshot Directory    ${OUTPUT_DIR}${/}robot${/}rpa
     Capture Page Screenshot    00_before.png
     Launch a new    Robot Framework    Notebook
     Capture Page Screenshot    01_new.png

diff --git a/atest/acceptance/02_Robot/01_Settings.robot b/atest/acceptance/02_Robot/01_Settings.robot
@@ -10,7 +10,7 @@ Library           SeleniumLibrary
 *** Test Cases ***
 Robot Notebook Remembers Settings
     [Documentation]    Will re-running Settings create an error in the logs?
-    Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}robot${/}settings${/}cellid
+    Set Screenshot Directory    ${OUTPUT_DIR}${/}robot${/}settings${/}cellid
     Capture Page Screenshot    00_before.png
     Launch a new    Robot Framework    Notebook
     Capture Page Screenshot    01_new.png
@@ -24,7 +24,7 @@ Robot Notebook Remembers Settings
 Robot Notebook completes Settings
     [Documentation]    Will tabbing complete various Suite Settings?
     [Tags]    skip:chrome
-    Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}robot${/}settings${/}complete
+    Set Screenshot Directory    ${OUTPUT_DIR}${/}robot${/}settings${/}complete
     Launch a new    Robot Framework    Notebook
     Add a Cell    *** Set
     Go to End of Cell Source

diff --git a/atest/resources/Lab.robot b/atest/resources/Lab.robot
@@ -29,8 +29,8 @@ Launch a new
 
 Start JupyterLab
     [Documentation]    Start a Jupyter Notebook Server with JupyterLab
-    ${notebooks} =  Set Variable  ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}_notebooks
-    ${log} =  Set Variable  ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}_lab.log
+    ${notebooks} =  Set Variable  _notebooks
+    ${log} =  Set Variable  _lab.log
     ${cmd} =  Set Variable  ${LAB_CMD} --notebook-dir=${notebooks}
     Create Directory      ${notebooks}
     Start Process    ${cmd}    shell=true    stderr=STDOUT    stdout=${log}

diff --git a/ci/job.combine.yml b/ci/job.combine.yml
@@ -18,17 +18,17 @@ jobs:
       - task: DownloadPipelineArtifact@0
         condition: always()
         inputs:
-          artifactName: Robot Output Linux
+          artifactName: Test Output Linux
           targetPath: _testoutput
       - task: DownloadPipelineArtifact@0
         condition: always()
         inputs:
-          artifactName: Robot Output MacOSX
+          artifactName: Test Output MacOSX
           targetPath: _testoutput
       - task: DownloadPipelineArtifact@0
         condition: always()
         inputs:
-          artifactName: Robot Output Windows
+          artifactName: Test Output Windows
           targetPath: _testoutput
       - script: python -m scripts.combine
         condition: always()
@@ -38,4 +38,4 @@ jobs:
         displayName: Publish Robot Output
         inputs:
           pathtoPublish: _testoutput
-          artifactName: irobotframework Robot Output
+          artifactName: irobotframework Test Output
diff --git a/ci/steps.common.yml b/ci/steps.common.yml
@@ -29,12 +29,18 @@ steps:
   - task: PublishTestResults@2
     displayName: Publish Test Results
     inputs:
-      testResultsFiles: _testoutput/**/*.xunit.xml
+      testResultsFiles: _testoutput/xunit/*.xml
+    condition: always()
+
+  - task: PublishCodeCoverageResults@1
+    inputs:
+      summaryFileLocation: _testoutput/cov/*.xml
+      reportDirectory: _testoutput/cov
     condition: always()
 
   - task: PublishPipelineArtifact@0
-    displayName: Publish Robot Output
+    displayName: Publish Test Output
     inputs:
       targetPath: _testoutput
-      artifactName: Robot Output ${{ parameters.name }}
+      artifactName: Test Output ${{ parameters.name }}
     condition: always()
diff --git a/ci/steps.conda.test.yml b/ci/steps.conda.test.yml
@@ -2,7 +2,7 @@ steps:
   - ${{ if eq(parameters.name, 'Windows') }}:
     - task: CondaEnvironment@1
       inputs:
-        createOptions: -c defaults -c conda-forge
+        createOptions: -c conda-forge -c defaults
         createCustomEnvironment: true
         updateConda: true
         environmentName: _test
@@ -15,7 +15,6 @@ steps:
           ipython>=7.2
           isort
           jupyter_kernel_test
-          jupyter_server
           jupyterlab>=0.35.4,<0.36
           nodejs>10,<11
           pillow
@@ -28,12 +27,10 @@ steps:
           robotframework>=3.1
           selenium>=3.141.0
           twine
-    - script: conda uninstall --force zeromq pyzmq && pip install pyzmq
-      displayName: zmq hack
   - ${{ if not(eq(parameters.name, 'Windows')) }}:
     - task: CondaEnvironment@1
       inputs:
-        createOptions: -c defaults -c conda-forge
+        createOptions: -c conda-forge -c defaults
         createCustomEnvironment: true
         updateConda: false
         environmentName: _test

diff --git a/scripts/combine.py b/scripts/combine.py
@@ -12,10 +12,10 @@ def combine():
         "--name",
         "IRobotFramework",
         "--outputdir",
-        str(TEST_OUT),
+        str(TEST_OUT / "robot"),
         "--output",
-        "output.xml",
-    ] + list(map(str, TEST_OUT.glob("*.xml")))
+        "index.xml",
+    ] + list(map(str, (TEST_OUT / "robot").glob("*.xml")))
 
     return run(args)
 

diff --git a/scripts/lint.py b/scripts/lint.py