more test work

Author: bollwyvl

.github/workflows/test.yaml

@@ -56,6 +56,12 @@ jobs:
           path: ./dist
 
   test:
+    name: |-
+      ${{ matrix.os }}
+      py${{ matrix.python-version }}
+      srv${{ matrix.jupyter_server-version }}
+      lab${{ matrix.jupyterlab-version }}
+      nb${{ matrix.notebook-version }}
     needs: [build]
     timeout-minutes: 30
     strategy:
@@ -90,7 +96,6 @@ jobs:
         shell: bash
 
     steps:
-
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
@@ -119,20 +124,6 @@ jobs:
           pip freeze
           pip check
 
-      - name: Run tests
-        run: |
-          pytest -k "not acceptance" -vv
-
-      - name: Upload pytest and coverage reports
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: |-
-            unit-tests-${{ matrix.python-version }}-${{ matrix.jupyterlab-version }}-${{ github.run_number }}
-          path: |
-            ./build/pytest
-            ./build/coverage
-
       - name: Check the Notebook Server extension is installed
         if: matrix.jupyterlab-version != '4'
         run: |
@@ -150,14 +141,21 @@ jobs:
           jupyter labextension list
           jupyter labextension list 2>&1 | grep -iE '@jupyterhub/jupyter-server-proxy.*OK.*'
 
-      # TODO: re-enable when upstream not broken
-      # - name: Lab extension browser check
-      #   run: |
-      #     python -m jupyterlab.browser_check
-
-      - name: Run acceptance tests
+      - name: Run tests
         run: |
-          pytest -s -k "acceptance"
+          mkdir build
+          cd build
+          pytest -vv ../tests -c ../pyproject.toml
+
+      - name: Upload pytest and coverage reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: |-
+            unit-tests-${{ matrix.python-version }}-${{ matrix.jupyterlab-version }}-${{ github.run_number }}
+          path: |
+            ./build/pytest
+            ./build/coverage
 
       - name: Upload acceptance test reports
         if: always()

labextension/package.json

@@ -41,7 +41,7 @@
     "watch:src": "jlpm build:lib -w --preserveWatchOutput",
     "watch:labextension": "jupyter labextension watch .",
     "deduplicate": "yarn-deduplicate -s fewer --fail",
-    "lint:prettier": "prettier --write --list-different \"../.github/*.yaml\" \"../*.{yaml,yml,md}\" \"../docs/**/*.md\" \"src/**/*.{tsx,ts}\""
+    "lint:prettier": "prettier --write \"../.github/**/*.yaml\" \"../*.{yaml,yml,md}\" \"../docs/**/*.md\" \"src/**/*.{tsx,ts}\""
   },
   "dependencies": {
     "@jupyterlab/application": "^2.0 || ^3.0 || ^4.0",

tests/acceptance/Notebook.robot

@@ -6,7 +6,7 @@ https://robotframework-jupyterlibrary.readthedocs.io/en/stable/.
 Documentation     Server Proxies in Notebook
 Library           JupyterLibrary
 Suite Setup       Start Notebook Tests
-Test Tags         app:nmotebook
+Test Tags         app:notebook
 
 *** Test Cases ***
 Notebook Loads

tests/conftest.py

@@ -89,9 +89,9 @@ def a_server(
 
 
 def wait_until_urlopen(url, **kwargs):
-    retries = 10
+    retries = 20
+
     while retries:
-        time.sleep(1)
         try:
             urlopen(url, **kwargs)
             break
@@ -107,6 +107,7 @@ def wait_until_urlopen(url, **kwargs):
                 flush=True,
             )
             retries -= 1
+        time.sleep(0.5)
 
 
 @fixture