Pre-release 0.3.1 (#42)

bollwyvl · web-flow · commit 59b1d94e5134 · 2021-04-30T17:00:50.000-04:00
diff --git a/.github/locks/docs/linux-64/conda.lock b/.github/locks/docs/linux-64/conda.lock
@@ -68,7 +68,7 @@ https://conda.anaconda.org/conda-forge/noarch/typing_extensions-3.7.4.3-py_0.tar
 https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
 https://conda.anaconda.org/conda-forge/noarch/wheel-0.36.2-pyhd3deb0d_0.tar.bz2#768bfbe026426d0e76b377997d1f2b98
 https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1
-https://conda.anaconda.org/conda-forge/noarch/babel-2.9.0-pyhd3deb0d_0.tar.bz2#1cb532c9a6fd4e56a9f0906b87c17b76
+https://conda.anaconda.org/conda-forge/noarch/babel-2.9.1-pyh44b312d_0.tar.bz2#74136ed39bfea0832d338df1e58d013e
 https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.9.3-pyhb0f4dca_0.tar.bz2#d243a293d7303ab6195d96ce8c16b1cb
 https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.12.5-py36h5fab9bb_1.tar.bz2#da529031bd8882eff7d72484661c1b83
 https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.5-py36hc120d54_0.tar.bz2#f49c72aeb497efcd918217d142ddfc9c
diff --git a/.github/locks/lint/linux-64/conda.lock b/.github/locks/lint/linux-64/conda.lock
@@ -50,7 +50,7 @@ https://conda.anaconda.org/conda-forge/linux-64/regex-2021.4.4-py38h497a2fe_0.ta
 https://conda.anaconda.org/conda-forge/noarch/robotframework-lint-1.1-pyh9f0ad1d_0.tar.bz2#c3fa280c4a10c06e83f23193ef4ea5cc
 https://conda.anaconda.org/conda-forge/noarch/robotframework-pythonlibcore-2.2.0-pyhd8ed1ab_0.tar.bz2#29a329f0b817038d27d7bdfb2ca04b5a
 https://conda.anaconda.org/conda-forge/linux-64/typed-ast-1.4.3-py38h497a2fe_0.tar.bz2#f4a5eeaccf5c5bab10491071ea2e32b1
-https://conda.anaconda.org/conda-forge/noarch/black-21.4b0-pyhd8ed1ab_0.tar.bz2#2e836ca8292cb164d8527d64cda3fdc3
+https://conda.anaconda.org/conda-forge/noarch/black-21.4b2-pyhd8ed1ab_0.tar.bz2#4f2d99eb5db5311952a043bf646c199f
 https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py38h497a2fe_1001.tar.bz2#56753dd777a6517b34966ddcb39af734
 https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.4.7-py38ha5dfef3_0.tar.bz2#a8b014aba670157256dabdc885f71af4
 https://conda.anaconda.org/conda-forge/linux-64/doit-0.33.1-py38h32f6830_1.tar.bz2#c3a34ba48a004ab17e926f72f13ca488
diff --git a/.github/locks/meta/linux-64/conda.lock b/.github/locks/meta/linux-64/conda.lock
@@ -109,5 +109,5 @@ https://conda.anaconda.org/conda-forge/noarch/ensureconda-1.4.1-pyhd8ed1ab_0.tar
 https://conda.anaconda.org/conda-forge/noarch/requests-toolbelt-0.9.1-py_0.tar.bz2#402668adee8fcba9a9c265cdc2a88f5a
 https://conda.anaconda.org/conda-forge/linux-64/conda-build-3.21.4-py39hf3d152e_0.tar.bz2#fced48eb5f382639bb4d0af18117e429
 https://conda.anaconda.org/conda-forge/noarch/conda-lock-0.9.1-pyhd8ed1ab_0.tar.bz2#c918c8071db1665663a46371b0a46620
-https://conda.anaconda.org/conda-forge/linux-64/mamba-0.12.0-py39h951de11_0.tar.bz2#458d59975c8f03fdef40f0e599489653
+https://conda.anaconda.org/conda-forge/linux-64/mamba-0.12.1-py39h951de11_0.tar.bz2#982a9076cfd28e53f24e1a8614bb140f
 https://conda.anaconda.org/conda-forge/noarch/twine-3.4.1-pyhd8ed1ab_0.tar.bz2#c7d4ab21a13c919f9ae59eae7bcebf2a
diff --git a/.github/locks/test/linux-64/py3.9/lab3/conda.lock b/.github/locks/test/linux-64/py3.9/lab3/conda.lock
@@ -57,7 +57,7 @@ https://conda.anaconda.org/conda-forge/noarch/testpath-0.4.4-py_0.tar.bz2#3b98ff
 https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
 https://conda.anaconda.org/conda-forge/noarch/wheel-0.36.2-pyhd3deb0d_0.tar.bz2#768bfbe026426d0e76b377997d1f2b98
 https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1
-https://conda.anaconda.org/conda-forge/noarch/babel-2.9.0-pyhd3deb0d_0.tar.bz2#1cb532c9a6fd4e56a9f0906b87c17b76
+https://conda.anaconda.org/conda-forge/noarch/babel-2.9.1-pyh44b312d_0.tar.bz2#74136ed39bfea0832d338df1e58d013e
 https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.12.5-py39hf3d152e_1.tar.bz2#83afa403caafd7ef3162385cca9bce13
 https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.5-py39he32792d_0.tar.bz2#b561e1fad1fc8bb343064bd5497444bb
 https://conda.anaconda.org/conda-forge/linux-64/chardet-4.0.0-py39hf3d152e_1.tar.bz2#d0da429a3428ffcacaad25595b96a648
@@ -112,7 +112,7 @@ https://conda.anaconda.org/conda-forge/linux-64/ipykernel-5.5.3-py39hef51801_0.t
 https://conda.anaconda.org/conda-forge/linux-64/jupyter_server-1.6.4-py39hf3d152e_0.tar.bz2#49e35c5dca28ce4efde9346ba608d6d7
 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.5.0-pyhd8ed1ab_0.tar.bz2#5de37a58281ec57b3abc1eecc6db1012
 https://conda.anaconda.org/conda-forge/noarch/notebook-6.3.0-pyha770c72_1.tar.bz2#6a53111a5a62d32abfa21aac8fc55a1b
-https://conda.anaconda.org/conda-forge/noarch/voila-0.2.9-pyhd8ed1ab_0.tar.bz2#fc25ed20c77360028cc38cab6391ea4b
+https://conda.anaconda.org/conda-forge/noarch/voila-0.2.10-pyhd8ed1ab_0.tar.bz2#3ac331314316886a570fe6cbb668dd0c
 https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.2.7-pyhd8ed1ab_0.tar.bz2#cf4723f3178fb1cae4f7bf8e31db0e38
 https://conda.anaconda.org/conda-forge/linux-64/widgetsnbextension-3.5.1-py39hf3d152e_4.tar.bz2#ae54c7d751b678c0021929892d598ecd
 https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.6.3-pyhd3deb0d_0.tar.bz2#536a9ed6d9e740f2b83d1a3c388e4388
diff --git a/atest/lab/10_notebook.robot b/atest/lab/10_notebook.robot
@@ -12,7 +12,7 @@ IPython Notebook on Lab
     Add and Run JupyterLab Code Cell    print("hello world")
     Wait Until JupyterLab Kernel Is Idle
     Current JupyterLab Cell Output Should Contain    hello world
-    Capture Page Screenshot    10-00-ipython.png
+    Capture Page Screenshot    lab${/}10-00-ipython.png
     Save JupyterLab Notebook
 
 IPython Notebook Outputs on Lab
@@ -32,15 +32,15 @@ Multiple Notebooks on Lab
     Add and Run JupyterLab Code Cell    print("hello world")
     Wait Until JupyterLab Kernel Is Idle
     Page Should Contain    hello world
-    Capture Page Screenshot    10-20-one-notebook.png
+    Capture Page Screenshot    lab${/}10-20-one-notebook.png
     Launch a new JupyterLab Document
     ${tab1} =    Get JupyterLab Dock Panel Tab    Untitled1.ipynb
     Click Element    ${tab1}
     Add and Run JupyterLab Code Cell    print("yet another world")    n=2
     Wait Until JupyterLab Kernel Is Idle
     Page Should Contain    another world
     Drag And Drop By Offset    ${tab1}    800    500
-    Capture Page Screenshot    10-21-two-notesbook.png
+    Capture Page Screenshot    lab${/}10-21-two-notesbook.png
     Close JupyterLab Dock Panel Tab    Untitled1.ipynb
     Maybe Accept a JupyterLab Prompt
     Page Should Not Contain    yet another world
diff --git a/atest/lab/20_magic.robot b/atest/lab/20_magic.robot
@@ -31,5 +31,5 @@ Wait for and Click Text
     ${sel} =    Set Variable    xpath://*[contains(text(), '${canary}')]
     Wait Until Page Contains Element    ${sel}
     Click Element    ${sel}
-    Capture Page Screenshot    20-00-magic-${NEXT SCREENSHOT}-${canary}.png
+    Capture Page Screenshot    lab${/}20-00-magic-${NEXT SCREENSHOT}-${canary}.png
     Set Test Variable    ${NEXT SCREENSHOT}    ${NEXT SCREENSHOT.__add__(1)}
diff --git a/atest/lab/__init__.robot b/atest/lab/__init__.robot
@@ -1,10 +1,14 @@
 *** Settings ***
 Suite Setup       Set Up JupyterLab Suite
-Suite Teardown    Terminate All Jupyter Servers
+Suite Teardown    Tear Down JupyterLab Suite
 Force Tags        client:jupyterlab
 Library           JupyterLibrary
 
 *** Keywords ***
 Set Up JupyterLab Suite
     Wait for New Jupyter Server to be Ready
-    Set Screenshot Directory    ${OUTPUT DIR}${/}lab
+
+Tear Down JupyterLab Suite
+    Run Keyword and Ignore Error
+    ...    Execute JupyterLab Command    Shut Down All Kernels
+    Terminate All Jupyter Servers
diff --git a/docs/HISTORY.ipynb b/docs/HISTORY.ipynb
@@ -25,7 +25,8 @@
     "| Voila                  | 0.2.9 |\n",
     "\n",
     "- Several JupyterLab keywords now accept an `${n}` argument to handle multiple documents on the page.\n",
-    "- Many JupyterLab keywords that wait for certain events can be configured with `${timeout}` and `${sleep}` to suit."
+    "- Many JupyterLab keywords that wait for certain events can be configured with `${timeout}` and `${sleep}` to suit.\n",
+    "- Properly pass library initialization options to `SeleniumLibrary`"
    ]
   },
   {
diff --git a/docs/rtd.yml b/docs/rtd.yml
@@ -77,7 +77,7 @@ dependencies:
   - https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
   - https://conda.anaconda.org/conda-forge/noarch/wheel-0.36.2-pyhd3deb0d_0.tar.bz2#768bfbe026426d0e76b377997d1f2b98
   - https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1
-  - https://conda.anaconda.org/conda-forge/noarch/babel-2.9.0-pyhd3deb0d_0.tar.bz2#1cb532c9a6fd4e56a9f0906b87c17b76
+  - https://conda.anaconda.org/conda-forge/noarch/babel-2.9.1-pyh44b312d_0.tar.bz2#74136ed39bfea0832d338df1e58d013e
   - https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.9.3-pyhb0f4dca_0.tar.bz2#d243a293d7303ab6195d96ce8c16b1cb
   - https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.12.5-py36h5fab9bb_1.tar.bz2#da529031bd8882eff7d72484661c1b83
   - https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.5-py36hc120d54_0.tar.bz2#f49c72aeb497efcd918217d142ddfc9c
diff --git a/src/JupyterLibrary/VERSION b/src/JupyterLibrary/VERSION
@@ -1 +1 @@
-0.3.1a0
+0.3.1
diff --git a/src/JupyterLibrary/core.py b/src/JupyterLibrary/core.py
@@ -30,6 +30,7 @@ def __init__(
         implicit_wait=0.0,
         run_on_failure="Capture Page Screenshot",
         screenshot_root_directory=None,
+        **kwargs
     ):
         """JupyterLibrary can be imported with several optional arguments.
         - ``timeout``:
@@ -43,10 +44,11 @@ def __init__(
           the directory where the log file is written is used.
         """
         super(JupyterLibrary, self).__init__(
-            timeout=5.0,
-            implicit_wait=0.0,
-            run_on_failure="Capture Page Screenshot",
-            screenshot_root_directory=None,
+            timeout=timeout,
+            implicit_wait=implicit_wait,
+            run_on_failure=run_on_failure,
+            screenshot_root_directory=screenshot_root_directory,
+            **kwargs
         )
         self.add_library_components(
             [Component(self) for Component in component_classes]
diff --git a/src/JupyterLibrary/keywords/server.py b/src/JupyterLibrary/keywords/server.py
@@ -191,7 +191,7 @@ def wait_for_new_jupyter_server_to_be_ready(self, command=None, *args, **config)
         return handle
 
     @keyword
-    def terminate_all_jupyter_servers(self, timeout="5s"):
+    def terminate_all_jupyter_servers(self, timeout="6s"):
         """Close all Jupyter servers started by
         [#Start New Jupyter Server|Start New Jupyter Server],
         waiting ``timeout`` to ensure all files/processes are freed before
@@ -215,14 +215,20 @@ def terminate_all_jupyter_servers(self, timeout="5s"):
         if shutdown:
             for nbh in self._handles:
                 try:
-                    plib.terminate_process(nbh, kill=True)
+                    plib.terminate_process(nbh)
                     terminated += 1
                 except Exception as err:
                     BuiltIn().log(err)
+            if self._handles:
+                BuiltIn().sleep(timeout)
+            for nbh in self._handles:
+                try:
+                    plib.terminate_process(nbh, kill=True)
+                except Exception as err:
+                    BuiltIn().log(err)
 
         # give processes a mo to shutdown
         if terminated or shutdown and self._tmpdirs:
-            BuiltIn().sleep(timeout)
             for nbh in self._handles:
                 shutil.rmtree(self._tmpdirs[nbh])
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`"\| Voila \| 0.2.9 \|\n",`
`26`	`26`	`"\n",`
`27`	`27`	"- Several JupyterLab keywords now accept an `${n}` argument to handle multiple documents on the page.\n",
`28`		- "- Many JupyterLab keywords that wait for certain events can be configured with `${timeout}` and `${sleep}` to suit."
	`28`	+ "- Many JupyterLab keywords that wait for certain events can be configured with `${timeout}` and `${sleep}` to suit.\n",
	`29`	+ "- Properly pass library initialization options to `SeleniumLibrary`"
`29`	`30`	`]`
`30`	`31`	`},`
`31`	`32`	`{`