Skip to content

Commit 4a471a0

Browse files
committed
review corrections
1 parent 79d6f0e commit 4a471a0

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

services/catalog/rs_server_catalog/user_catalog.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,8 @@ async def dispatch(
13521352
and not self.request_ids["collection_ids"]
13531353
and response_content["code"] == "NotFoundError"
13541354
):
1355+
# Return empty list of properties and additionalProperties set to true on /catalog/queryables
1356+
# when there are no collections in catalog.
13551357
empty_catalog_queryables_response = {
13561358
"$id": f"{request.base_url}queryables",
13571359
"type": "object",

services/catalog/tests/conftest.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@ def add_feature(client: TestClient, feature: Feature):
477477
@pytest.mark.integration
478478
@pytest.fixture(scope="session", autouse=True)
479479
def setup_database(
480-
request, # Inject pytest request object
481480
client,
482481
toto_s1_l1,
483482
toto_s2_l3,
@@ -506,10 +505,6 @@ def setup_database(
506505
user id titi.
507506
"""
508507

509-
# If test is using `client_with_empty_catalog`, do nothing
510-
if "client_with_empty_catalog" in request.fixturenames:
511-
return
512-
513508
add_collection(client, toto_s1_l1)
514509
add_collection(client, toto_s2_l3)
515510
add_collection(client, titi_s2_l1)

0 commit comments

Comments
 (0)