add test for custom template

opt-in test, only run when --helm is given

.github/workflows/test.yml

@@ -248,7 +248,7 @@ jobs:
         if: matrix.test == 'helm'
         run: |
           export BINDER_URL=http://localhost:30901
-          pytest -m "remote" -v --maxfail=10 --cov binderhub --durations=10 --color=yes
+          pytest --helm -m "remote" -v --maxfail=10 --cov binderhub --durations=10 --color=yes
 
       # GitHub Action reference: https://github.com/jupyterhub/action-k8s-namespace-report
       - name: Kubernetes namespace report

binderhub/tests/conftest.py

@@ -48,15 +48,23 @@ def pytest_configure(config):
     config.addinivalue_line(
         "markers", "auth: mark test to run only on auth environments"
     )
-    config.addinivalue_line(
-        "markers", "remote: mark test to run only on remote environments"
-    )
     config.addinivalue_line(
         "markers", "github_api: mark test to run only with GitHub API credentials"
     )
     config.addinivalue_line(
         "markers", "remote: mark test for when BinderHub is already running somewhere."
     )
+    config.addinivalue_line(
+        "markers",
+        "helm: mark test to only run when BinderHub is launched with our k8s-binderhub test config.",
+    )
+
+
+def pytest_runtest_setup(item):
+    is_helm_test = any(mark for mark in item.iter_markers(name="helm"))
+    if not item.config.getoption("--helm"):
+        if is_helm_test:
+            pytest.skip("Skipping test marked as 'helm'")
 
 
 def pytest_terminal_summary(terminalreporter, exitstatus):

binderhub/tests/test_main.py

@@ -83,6 +83,15 @@ async def test_main_page(app):
         assert r.status_code == 200, f"{r.status_code} {url}"
 
 
+@pytest.mark.remote
+@pytest.mark.helm
+async def test_custom_template(app):
+    """Check that our custom template config is applied via the helm chart"""
+    r = await async_requests.get(app.url)
+    assert r.status_code == 200
+    assert "test-template" in r.text
+
+
 @pytest.mark.remote
 async def test_about_handler(app):
     # Check that the about page loads

conftest.py

@@ -0,0 +1,14 @@
+"""top-level pytest config
+
+options can only be defined here,
+not in binderhub/tests/conftest.py
+"""
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--helm",
+        action="store_true",
+        default=False,
+        help="Run tests marked with pytest.mark.helm",
+    )