combine logs, try to fix notebook/nteract issue

bollwyvl · bollwyvl · commit ea61b3fef065 · 2018-12-15T23:15:16.000-05:00
diff --git a/anaconda-project.yml b/anaconda-project.yml
@@ -30,7 +30,24 @@ commands:
     env_spec: rfjl37
 
   atest:
-    unix: rm -rf _artifacts/test_output && python -m scripts.atest
+    unix: python -m scripts.atest
+    env_spec: rfjl37
+
+  atest:full:
+    unix: |-
+      set -eux &&
+      rm -rf _artifacts/test_output &&
+      python -m scripts.atest &&
+      BROWSER=headlesschrome python -m scripts.atest &&
+      python -m scripts.combine
+    env_spec: rfjl37
+
+  atest:clean:
+    unix: rm -rf _artifacts/test_output
+    env_spec: rfjl37
+
+  atest:combine:
+    unix: python -m scripts.combine
     env_spec: rfjl37
 
   atest:win:
diff --git a/atest/acceptance/01_server/00_basic.robot b/atest/acceptance/01_server/00_basic.robot
@@ -1,13 +1,17 @@
 *** Settings ***
+Suite Setup       Create Directory    ${LOGS}
 Suite Teardown    Terminate All Jupyter Servers
 Force Tags        server
 Library           JupyterLibrary
 Library           Process
 Library           OperatingSystem
 
+*** Variables ***
+${LOGS}           ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}logs${/}
+
 *** Test Cases ***
 Start one server
-    ${nbserver} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}one_server.log    stderr=STDOUT
+    ${nbserver} =    Start New Jupyter Server    stdout=${LOGS}1.log    stderr=STDOUT
     ${ready} =    Wait for Jupyter Server to be Ready
     Should be equal as integers    ${ready}    1    msg=One server should be ready
     ${terminated} =    Terminate All Jupyter Servers
@@ -16,11 +20,12 @@ Start one server
     Should Contain    ${log}    The Jupyter Notebook is running    msg=Log should contain expected status message
 
 Start three servers
-    ${nb1} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}one_of_three_server.log    stderr=STDOUT
-    ${nb2} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}two_of_three_server.log    stderr=STDOUT
+    [Setup]    Create Directory    ${LOGS}3
+    ${nb1} =    Start New Jupyter Server    stdout=${LOGS}3${/}1.log    stderr=STDOUT
+    ${nb2} =    Start New Jupyter Server    stdout=${LOGS}3${/}2.log    stderr=STDOUT
     ${ready} =    Wait for Jupyter Server to be Ready    ${nb2}    ${nb1}
     Should be equal as integers    ${ready}    2    msg=Three servers should be ready
-    ${nb3} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}three_of_three_server.log    stderr=STDOUT
+    ${nb3} =    Start New Jupyter Server    stdout=${LOGS}3${/}3.log    stderr=STDOUT
     ${terminated} =    Terminate All Jupyter Servers
     Should be equal as integers    ${terminated}    3    msg=Three servers should have been terminated
     ${log1} =    Get Process Result    ${nb1}    stderr=${True}
@@ -32,7 +37,7 @@ Start three servers
 
 Server Files
     [Setup]    Create File    ${OUTPUT_DIR}${/}foo.txt    bar
-    ${nb1} =    Start New Jupyter Server    stdout=${OUTPUT_DIR}${/}files.log    stderr=STDOUT
+    ${nb1} =    Start New Jupyter Server    stdout=${LOGS}files.log    stderr=STDOUT
     Copy Files to Jupyter Directory    ${OUTPUT_DIR}${/}*.txt
     ${nbdir} =    Get Jupyter Directory    ${nb1}
     ${out} =    Get File    ${nbdir}${/}foo.txt
diff --git a/atest/acceptance/__init__.robot b/atest/acceptance/__init__.robot
@@ -1,6 +1,7 @@
 *** Settings ***
-Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}screenshots
+Suite Setup       Set Screenshot Directory    ${OUTPUT_DIR}${/}${OS}${/}${BROWSER}${/}screenshots
 Suite Teardown    Clean Up Everything
+Force Tags        os:${OS}    browser:${BROWSER}
 Library           JupyterLibrary
 Library           Process
 
diff --git a/atest/acceptance/classic/__init__.robot b/atest/acceptance/classic/__init__.robot
@@ -1,5 +1,5 @@
 *** Settings ***
 Suite Setup       Wait for New Jupyter Server to be Ready
 Suite Teardown    Terminate All Jupyter Servers
-Force Tags        classic
+Force Tags        client:notebook
 Library           JupyterLibrary
diff --git a/atest/acceptance/lab/__init__.robot b/atest/acceptance/lab/__init__.robot
@@ -1,5 +1,5 @@
 *** Settings ***
 Suite Setup       Wait for New Jupyter Server to be Ready
 Suite Teardown    Terminate All Jupyter Servers
-Force Tags        jupyterlab
+Force Tags        client:jupyterlab
 Library           JupyterLibrary
diff --git a/atest/acceptance/nteract/__init__.robot b/atest/acceptance/nteract/__init__.robot
@@ -1,5 +1,5 @@
 *** Settings ***
 Suite Setup       Wait for New Jupyter Server to be Ready
 Suite Teardown    Terminate All Jupyter Servers
-Force Tags        nteract
+Force Tags        client:nteract_on_jupyter
 Library           JupyterLibrary
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,22 +1,23 @@
 jobs:
-- template: ci/job.yml
+- template: ci/job.test.yml
   parameters:
     name: Linux
     vmImage: ubuntu-16.04
 
-- template: ci/job.yml
+- template: ci/job.test.yml
   parameters:
     name: MacOSX
     vmImage: macos-10.13
 
-- template: ci/job.yml
+- template: ci/job.test.yml
   parameters:
     name: Windows
     vmImage: vs2017-win2016
 
-variables:
-  MINICONDA_VERSION: 4.5.4
-  CONDA_VERSION: 4.5.11
+- template: ci/job.combine.yml
+  parameters:
+    name: Linux
+    vmImage: ubuntu-16.04
 
 trigger: [master]
 
diff --git a/ci/job.combine.yml b/ci/job.combine.yml
@@ -0,0 +1,36 @@
+parameters:
+  name: Linux
+  vmImage: ubuntu-16.04
+
+jobs:
+  - job: ${{ parameters.name }}
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    dependsOn:
+      - Linux
+      - MacOSX
+      - Windows
+    steps:
+      - task: DownloadPipelineArtifact@0
+        inputs:
+          artifactName: Linux Tests
+          targetPath: _artifacts/test_output
+      - task: DownloadPipelineArtifact@0
+        inputs:
+          artifactName: MacOSX Tests
+          targetPath: _artifacts/test_output
+      - task: DownloadPipelineArtifact@0
+        inputs:
+          artifactName: Windows Tests
+          targetPath: _artifacts/test_output
+      - template: steps.conda.yml
+        parameters:
+          name: Linux
+      - script: python -m scripts.combine
+        displayName: Rebot
+      - task: PublishBuildArtifacts@1
+        displayName: Publish Robot Logs
+        inputs:
+          PathtoPublish: _artifacts/test_output
+          ArtifactName: Combined Robot Logs
+        condition: always()
diff --git a/ci/job.test.yml b/ci/job.test.yml
@@ -8,13 +8,9 @@ jobs:
       vmImage: ${{ parameters.vmImage }}
 
     steps:
-      - ${{ if eq(parameters.name, 'MacOSX') }}:
-        - script: |
-            HOMEBREW_NO_AUTO_UPDATE=1 \
-            brew tap caskroom/cask \
-            && brew cask install google-chrome \
-            && brew cask install firefox
-          displayName: Install Browsers on MacOSX
+      - template: steps.browser.yml
+        parameters:
+          name: ${{ parameters.name }}
 
       - template: steps.conda.yml
         parameters:
diff --git a/ci/steps.browser.yml b/ci/steps.browser.yml
@@ -0,0 +1,11 @@
+parameters:
+  name: Linux
+
+steps:
+  - ${{ if eq(parameters.name, 'MacOSX') }}:
+    - script: |
+        HOMEBREW_NO_AUTO_UPDATE=1 \
+        brew tap caskroom/cask \
+        && brew cask install google-chrome \
+        && brew cask install firefox
+      displayName: Install Browsers on MacOSX
diff --git a/ci/steps.common.yml b/ci/steps.common.yml
@@ -18,7 +18,11 @@ steps:
       displayName: Install Source Distribution
 
   - script: python -m scripts.atest
-    displayName: Test
+    displayName: Test on Firefox
+
+  - ${{ if not(eq(parameters.name, 'Windows')) }}:
+    - script: BROWSER=headlesschrome python -m scripts.atest
+      displayName: Test on Chrome
 
   - ${{ if eq(parameters.name, 'Linux') }}:
     - script: sphinx-build -M html docs _artifacts/docs
@@ -27,7 +31,7 @@ steps:
       displayName: Publish Docs
       inputs:
         PathtoPublish: _artifacts/docs/html
-        ArtifactName: ${{ parameters.name }} tests
+        ArtifactName: Docs
       condition: always()
 
   - task: PublishTestResults@2
@@ -40,5 +44,5 @@ steps:
     displayName: Publish Robot Logs
     inputs:
       PathtoPublish: _artifacts/test_output
-      ArtifactName: ${{ parameters.name }} tests
+      ArtifactName: ${{ parameters.name }} Robot Logs
     condition: always()
diff --git a/scripts/__init__.py b/scripts/__init__.py
@@ -0,0 +1,11 @@
+import os
+import platform
+from os.path import abspath, dirname, join
+
+HERE = dirname(__file__)
+TESTS = abspath(join(HERE, "..", "atest", "acceptance"))
+
+TEST_OUT = abspath(join(HERE, "..", "_artifacts", "test_output"))
+
+PLATFORM = platform.system().lower()
+BROWSER = os.environ.get("BROWSER", "headlessfirefox")
diff --git a/scripts/atest.py b/scripts/atest.py
@@ -1,24 +1,43 @@
 import subprocess
 import sys
-from os.path import abspath, dirname, join
+from os.path import join
 
 # import for PATH side-effect. yuck.
 import chromedriver_binary  # noqa
 
-
-here = dirname(__file__)
-out = abspath(join(here, "..", "_artifacts", "test_output"))
-tests = abspath(join(here, "..", "atest", "acceptance"))
-
-
-def run_tests(*robot_args):
-    proc = subprocess.Popen(
-        ["python", "-m", "robot", "-d", out, "--xunit", "robot.xunit.xml"]
-        + list(robot_args)
-        + [tests],
-        cwd=here,
+from . import BROWSER, HERE, PLATFORM, TEST_OUT, TESTS
+
+
+def run_tests(robot_args):
+    args = (
+        [
+            "python",
+            "-m",
+            "robot",
+            "-d",
+            TEST_OUT,
+            "--log",
+            join(TEST_OUT, join(".".join([PLATFORM, BROWSER, "log", "html"]))),
+            "--name",
+            "{} on {}".format(BROWSER, PLATFORM),
+            "--output",
+            join(TEST_OUT, join(".".join([PLATFORM, BROWSER, "robot", "xml"]))),
+            "--report",
+            join(TEST_OUT, join(".".join([PLATFORM, BROWSER, "report", "html"]))),
+            "--variable",
+            "BROWSER:" + BROWSER,
+            "--variable",
+            "OS:" + PLATFORM,
+            "--xunit",
+            ".".join([PLATFORM, BROWSER, "robot", "xunit", "xml"]),
+        ]
+        + robot_args
+        + [TESTS]
     )
 
+    print(" ".join(args))
+    proc = subprocess.Popen(args, cwd=HERE)
+
     try:
         return proc.wait()
     except KeyboardInterrupt:
@@ -27,4 +46,4 @@ def run_tests(*robot_args):
 
 
 if __name__ == "__main__":
-    sys.exit(run_tests(*sys.argv[1:]))
+    sys.exit(run_tests(sys.argv[1:]))
diff --git a/scripts/combine.py b/scripts/combine.py
@@ -0,0 +1,30 @@
+import subprocess
+from glob import glob
+from os.path import join
+
+from . import HERE, TEST_OUT
+
+
+def combine():
+    args = [
+        "python",
+        "-m",
+        "robot.rebot",
+        "--name",
+        "JupyterLibrary",
+        "--outputdir",
+        TEST_OUT,
+        "--output",
+        "output.xml",
+    ] + list(glob(join(TEST_OUT, "*.robot.xml")))
+    proc = subprocess.Popen(args, cwd=HERE)
+
+    try:
+        return proc.wait()
+    except KeyboardInterrupt:
+        proc.kill()
+        return proc.wait()
+
+
+if __name__ == "__main__":
+    combine()
diff --git a/src/JupyterLibrary/clients/notebook/Selectors.robot b/src/JupyterLibrary/clients/notebook/Selectors.robot
@@ -1,5 +1,6 @@
 *** Variables ***
 ${JNC CSS TREE LIST}  \#notebook_list
+${JNC CSS TREE LIST ITEM}  ${JNC CSS TREE LIST} .list_item
 ${JNC CSS TREE NEW BUTTON}  \#new-dropdown-button
 ${JNC CSS TREE NEW MENU}  \#new-menu
 ${JNC CSS NB KERNEL ICON}  \#kernel_indicator_icon
diff --git a/src/JupyterLibrary/clients/notebook/Tree.robot b/src/JupyterLibrary/clients/notebook/Tree.robot
@@ -16,6 +16,7 @@ Open Notebook Classic
     ${token} =  Run Keyword If    not "${url}"  Get Jupyter Server Token  ${nbserver}
     ${final_url} =  Set Variable If   "${url}"   ${url}  ${nbserver_url}tree?token=${token}
     Open Browser    url=${final_url}    browser=${browser}  &{configuration}
+    Wait Until Page Contains Element  css:${JNC CSS TREE LIST ITEM}
 
 Launch a new Notebook Classic Notebook
     [Arguments]    ${kernel}=Python 3
