ci: iterate on hub.existingSecret test

jupyterhub · Feb 21, 2021 · 3987f1e · 3987f1e
1 parent a868655
commit 3987f1e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ci/test-hub-existing-secret.yaml b/ci/test-hub-existing-secret.yaml
@@ -5,7 +5,6 @@ metadata:
   name: test-hub-existing-secret
 type: Opaque
 stringData:
-  ConfigurableHTTPProxy.auth_token: fff999
   JupyterHub.cookie_secret: fff999
   CryptKeeper.keys: fff999
   values.yaml: |

diff --git a/dev-config.yaml b/dev-config.yaml
@@ -62,7 +62,7 @@ hub:
           print(f"MYSQL_PWD={os.environ.get('MYSQL_PWD', None)}")
           print(f"PGPASSWORD={os.environ.get('PGPASSWORD', None)}")
           print()
-          print(f"ConfigurableHTTPProxy.auth_token={get_secret_value('ConfigurableHTTPProxy.auth_token', None)}")
+          print(f"CONFIGPROXY_AUTH_TOKEN={os.environ.get('CONFIGPROXY_AUTH_TOKEN', None)}")
           print(f"JupyterHub.cookie_secret={get_secret_value('JupyterHub.cookie_secret', None)}")
           print(f"CryptKeeper.keys={get_secret_value('CryptKeeper.keys', None)}")
           print()

diff --git a/tests/test_hub.py b/tests/test_hub.py
@@ -215,10 +215,11 @@ def test_load_existing_secret():
     else:
         k8s_secret_exist = False
         match = re.compile(r".*hub.existingSecret=(?P<ref>[\S]*).*", re.DOTALL).match(
-            "f\nfhub.existingSecret=\nf"
+            hub_logs
         )
         if match:
             k8s_secret = match.group("ref")
+            assert k8s_secret, "This should never be found "
             c = subprocess.run(["kubectl", "get", "secret", k8s_secret])
             if c.returncode != 0:
                 pytest.skip(f"k8s Secret '{k8s_secret}' not found")
@@ -231,7 +232,7 @@ def test_load_existing_secret():
     #        variables MYSQL_PWD and PGPASSWORD would be setup correctly. But,
     #        configuring that would make the hub fail to startup without an
     #        actual database.
-    assert "ConfigurableHTTPProxy.auth_token=aaa111" in hub_logs
+    assert "CONFIGPROXY_AUTH_TOKEN=aaa111" in hub_logs
     assert "JupyterHub.cookie_secret=fff999" in hub_logs
     assert "CryptKeeper.keys=fff999" in hub_logs
     assert "singleuser.extraLabels.test-chart-managed-secret=ok" in hub_logs