Fix /vMAJOR/info in index server

optimade/server/main_index.py

@@ -81,7 +81,7 @@
 def add_major_version_base_url(app: FastAPI):
     """ Add mandatory endpoints to `/vMAJOR` base URL. """
     for endpoint in (index_info, links):
-        app.include_router(links.router, prefix=BASE_URL_PREFIXES["major"])
+        app.include_router(endpoint.router, prefix=BASE_URL_PREFIXES["major"])
 
 
 def add_optional_versioned_base_urls(app: FastAPI):

tests/server/test_server_validation.py

@@ -1,6 +1,8 @@
 import os
 from traceback import print_exc
 
+import pytest
+
 from optimade.validator import ImplementationValidator
 
 
@@ -59,3 +61,41 @@ def test_as_type_with_validator(client):
             except Exception:
                 print_exc()
             assert validator.valid
+
+
+@pytest.mark.parametrize("server", ["regular", "index"])
+def test_versioned_base_urls(client, index_client, server: str):
+    """Test all expected versioned base URLs responds with 200
+
+    This depends on the routers for each kind of server.
+    """
+    try:
+        import simplejson as json
+    except ImportError:
+        import json
+
+    from optimade.server.routers.utils import BASE_URL_PREFIXES
+
+    clients = {
+        "regular": client,
+        "index": index_client,
+    }
+
+    valid_endpoints = {
+        "regular": ("/info", "/links", "/references", "/structures"),
+        "index": ("/info", "/links"),
+    }
+
+    for version in BASE_URL_PREFIXES.values():
+        for endpoint in valid_endpoints[server]:
+            response = clients[server].get(url=version + endpoint)
+            json_response = response.json()
+
+            assert response.status_code == 200, (
+                f"Request to {response.url} failed for server {server!r}: "
+                f"{json.dumps(json_response, indent=2)}"
+            )
+            assert "meta" in json_response, (
+                f"Mandatory 'meta' top-level field not found in request to {response.url} for "
+                f"server {server!r}. Response: {json.dumps(json_response, indent=2)}"
+            )

tests/server/utils.py

@@ -43,13 +43,13 @@ def __init__(
         )
         if version:
             if not version.startswith("v"):
-                version = f"v{version}"
+                version = f"/v{version}"
             if re.match(r"v[0-9](.[0-9]){0,2}", version) is None:
                 warnings.warn(
                     f"Invalid version passed to client: '{version}'. "
                     f"Will use the default: 'v{__api_version__.split('.')[0]}'"
                 )
-                version = f"v{__api_version__.split('.')[0]}"
+                version = f"/v{__api_version__.split('.')[0]}"
         self.version = version
 
     def request(  # pylint: disable=too-many-locals
@@ -77,7 +77,7 @@ def request(  # pylint: disable=too-many-locals
         ):
             while url.startswith("/"):
                 url = url[1:]
-            url = f"/{self.version}{url}"
+            url = f"{self.version}/{url}"
         return super(OptimadeTestClient, self).request(
             method=method,
             url=url,