fix: add NB_PREFIX to tests

Blair Drummond · Blair Drummond · commit 682b932f0fd4 · 2021-05-15T12:14:57.000-04:00
diff --git a/conftest.py b/conftest.py
@@ -50,16 +50,25 @@ class TrackedContainer(object):
         Docker client instance
     image_name: str
         Name of the docker image to launch
+    nb_prefix: str, optional
+        The NB_PREFIX arg, the base url for the server
     **kwargs: dict, optional
         Default keyword arguments to pass to docker.DockerClient.containers.run
     """
 
-    def __init__(self, docker_client, image_name, **kwargs):
+    def __init__(self, docker_client, image_name, nb_prefix="/notebook/user/name", **kwargs):
         self.container = None
         self.docker_client = docker_client
         self.image_name = image_name
         self.kwargs = kwargs
 
+        if not 'environment' in self.kwargs:
+            self.kwargs['environment'] = {}
+
+        # This base_url is important for kubeflow testing
+        self.kwargs['environment']['NB_PREFIX'] = nb_prefix
+
+
     def run(self, **kwargs):
         """Runs a docker container using the preconfigured image name
         and a mix of the preconfigured container options and those passed
diff --git a/output/remote-desktop/start-remote-desktop.sh b/output/remote-desktop/start-remote-desktop.sh
@@ -96,6 +96,7 @@ cat $HOME/.vnc/*.log
     ./utils/launch.sh --web $(pwd) --vnc --unix-target=$VNC_SOCKET --listen 5678
 ) &
 
+NB_PREFIX=${NB_PREFIX:-/vnc}
 sed -i "s~\${NB_PREFIX}~$NB_PREFIX~g" /etc/nginx/nginx.conf
 
 nginx
diff --git a/resources/remote-desktop/start-remote-desktop.sh b/resources/remote-desktop/start-remote-desktop.sh
@@ -96,6 +96,7 @@ cat $HOME/.vnc/*.log
     ./utils/launch.sh --web $(pwd) --vnc --unix-target=$VNC_SOCKET --listen 5678
 ) &
 
+NB_PREFIX=${NB_PREFIX:-/}
 sed -i "s~\${NB_PREFIX}~$NB_PREFIX~g" /etc/nginx/nginx.conf
 
 nginx
diff --git a/tests/general/test_notebook.py b/tests/general/test_notebook.py
@@ -3,9 +3,15 @@
 import logging
 
 LOGGER = logging.getLogger(__name__)
+ENV = {
+    "NB_PREFIX":"/notebook/username/test",
+}
 
 def test_server_alive(container, http_client, url="http://localhost:8888"):
     """Notebook server should eventually appear with a recognizable page."""
+
+    url = "{}{}/".format(url, container.kwargs['environment']['NB_PREFIX'])
+
     LOGGER.info("Running test_server_alive")
     LOGGER.info("launching the container")
     container.run()
@@ -14,15 +20,16 @@ def test_server_alive(container, http_client, url="http://localhost:8888"):
     resp.raise_for_status()
     LOGGER.debug(f"got text from url: {resp.text}")
 
-    # Not sure why but some flavors of JupyterLab images don't hit all of these.  
+    # Not sure why but some flavors of JupyterLab images don't hit all of these.
     # Trying to catch several different acceptable looks.
     # Also accepting RStudio
-    # TODO: This general test accepts many different images.  
+    # TODO: This general test accepts many different images.
     #       Could refactor to have specific tests that are more pointed
     assert any((
         "<title>JupyterLab" in resp.text,
         "<title>Jupyter Notebook</title>" in resp.text,
         "<title>RStudio:" in resp.text,  # RStudio
         '<html lang="en" class="noVNC_loading">' in resp.text,  # remote-desktop using noVNC
+        '<html lang="fr" class="noVNC_loading">' in resp.text,  # remote-desktop using noVNC
         '<span id="running_list_info">Currently running Jupyter processes</span>' in resp.text,
         )), "Image does not appear to start to JupyterLab page.  Try starting yourself and browsing to it to see what is happening"
