pgstac: move asyncio-mode config into pytest.ini and remove unnecessary pytest.mark.asyncio tags (#390)

* pgstac: move asyncio-mode config into pytest.ini and remove unnecessary pytest.mark.asyncio tags

* Pin pytest-asyncio version in pgstac

Co-authored-by: Nathan Zimmerman <[email protected]>

Author: philvarner

Makefile

@@ -44,7 +44,7 @@ test-sqlalchemy: run-joplin-sqlalchemy
 
 .PHONY: test-pgstac
 test-pgstac:
-	$(run_pgstac) /bin/bash -c 'export && ./scripts/wait-for-it.sh database:5432 && cd /app/stac_fastapi/pgstac/tests/ && pytest -vvv --asyncio-mode=auto'
+	$(run_pgstac) /bin/bash -c 'export && ./scripts/wait-for-it.sh database:5432 && cd /app/stac_fastapi/pgstac/tests/ && pytest -vvv'
 
 .PHONY: run-database
 run-database:

stac_fastapi/pgstac/pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+testpaths = tests
+addopts = -sv
+asyncio_mode = auto

stac_fastapi/pgstac/setup.py

@@ -23,7 +23,7 @@
     "dev": [
         "pytest",
         "pytest-cov",
-        "pytest-asyncio",
+        "pytest-asyncio>=0.17",
         "pre-commit",
         "requests",
         "pypgstac==0.4.5",

stac_fastapi/pgstac/tests/api/test_api.py

@@ -1,7 +1,5 @@
 from datetime import datetime, timedelta
 
-import pytest
-
 STAC_CORE_ROUTES = [
     "GET /",
     "GET /collections",
@@ -23,20 +21,17 @@
 ]
 
 
-@pytest.mark.asyncio
 async def test_post_search_content_type(app_client):
     params = {"limit": 1}
     resp = await app_client.post("search", json=params)
     assert resp.headers["content-type"] == "application/geo+json"
 
 
-@pytest.mark.asyncio
 async def test_get_search_content_type(app_client):
     resp = await app_client.get("search")
     assert resp.headers["content-type"] == "application/geo+json"
 
 
-@pytest.mark.asyncio
 async def test_api_headers(app_client):
     resp = await app_client.get("/api")
     assert (
@@ -45,7 +40,6 @@ async def test_api_headers(app_client):
     assert resp.status_code == 200
 
 
-@pytest.mark.asyncio
 async def test_core_router(api_client):
     core_routes = set(STAC_CORE_ROUTES)
     api_routes = set(
@@ -54,7 +48,6 @@ async def test_core_router(api_client):
     assert not core_routes - api_routes
 
 
-@pytest.mark.asyncio
 async def test_transactions_router(api_client):
     transaction_routes = set(STAC_TRANSACTION_ROUTES)
     api_routes = set(
@@ -63,7 +56,6 @@ async def test_transactions_router(api_client):
     assert not transaction_routes - api_routes
 
 
-@pytest.mark.asyncio
 async def test_app_transaction_extension(
     app_client, load_test_data, load_test_collection
 ):
@@ -73,7 +65,6 @@ async def test_app_transaction_extension(
     assert resp.status_code == 200
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension(load_test_data, app_client, load_test_collection):
     coll = load_test_collection
     item = load_test_data("test_item.json")
@@ -87,7 +78,6 @@ async def test_app_query_extension(load_test_data, app_client, load_test_collect
     assert len(resp_json["features"]) == 1
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension_limit_1(
     load_test_data, app_client, load_test_collection
 ):
@@ -103,14 +93,12 @@ async def test_app_query_extension_limit_1(
     assert len(resp_json["features"]) == 1
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension_limit_eq0(app_client):
     params = {"limit": 0}
     resp = await app_client.post("/search", json=params)
     assert resp.status_code == 400
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension_limit_lt0(
     load_test_data, app_client, load_test_collection
 ):
@@ -124,7 +112,6 @@ async def test_app_query_extension_limit_lt0(
     assert resp.status_code == 400
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension_limit_gt10000(
     load_test_data, app_client, load_test_collection
 ):
@@ -138,7 +125,6 @@ async def test_app_query_extension_limit_gt10000(
     assert resp.status_code == 400
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension_gt(load_test_data, app_client, load_test_collection):
     coll = load_test_collection
     item = load_test_data("test_item.json")
@@ -152,7 +138,6 @@ async def test_app_query_extension_gt(load_test_data, app_client, load_test_coll
     assert len(resp_json["features"]) == 0
 
 
-@pytest.mark.asyncio
 async def test_app_query_extension_gte(
     load_test_data, app_client, load_test_collection
 ):
@@ -168,7 +153,6 @@ async def test_app_query_extension_gte(
     assert len(resp_json["features"]) == 1
 
 
-@pytest.mark.asyncio
 async def test_app_sort_extension(load_test_data, app_client, load_test_collection):
     coll = load_test_collection
     first_item = load_test_data("test_item.json")
@@ -209,7 +193,6 @@ async def test_app_sort_extension(load_test_data, app_client, load_test_collecti
     assert resp_json["features"][0]["id"] == second_item["id"]
 
 
-@pytest.mark.asyncio
 async def test_search_invalid_date(load_test_data, app_client, load_test_collection):
     coll = load_test_collection
     first_item = load_test_data("test_item.json")
@@ -225,7 +208,6 @@ async def test_search_invalid_date(load_test_data, app_client, load_test_collect
     assert resp.status_code == 400
 
 
-@pytest.mark.asyncio
 async def test_bbox_3d(load_test_data, app_client, load_test_collection):
     coll = load_test_collection
     first_item = load_test_data("test_item.json")
@@ -244,7 +226,6 @@ async def test_bbox_3d(load_test_data, app_client, load_test_collection):
     assert len(resp_json["features"]) == 1
 
 
-@pytest.mark.asyncio
 async def test_app_search_response(load_test_data, app_client, load_test_collection):
     coll = load_test_collection
     params = {
@@ -260,7 +241,6 @@ async def test_app_search_response(load_test_data, app_client, load_test_collect
     assert resp_json.get("stac_extensions") is None
 
 
-@pytest.mark.asyncio
 async def test_search_point_intersects(
     load_test_data, app_client, load_test_collection
 ):
@@ -282,7 +262,6 @@ async def test_search_point_intersects(
     assert len(resp_json["features"]) == 1
 
 
-@pytest.mark.asyncio
 async def test_search_line_string_intersects(
     load_test_data, app_client, load_test_collection
 ):

stac_fastapi/pgstac/tests/clients/test_postgres.py

@@ -1,13 +1,11 @@
 import uuid
 from typing import Callable
 
-import pytest
 from stac_pydantic import Collection, Item
 
 # from tests.conftest import MockStarletteRequest
 
 
-@pytest.mark.asyncio
 async def test_create_collection(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     in_coll = Collection.parse_obj(in_json)
@@ -24,7 +22,6 @@ async def test_create_collection(app_client, load_test_data: Callable):
     assert post_coll.dict(exclude={"links"}) == get_coll.dict(exclude={"links"})
 
 
-@pytest.mark.asyncio
 async def test_update_collection(app_client, load_test_collection):
     in_coll = load_test_collection
     in_coll.keywords.append("newkeyword")
@@ -40,7 +37,6 @@ async def test_update_collection(app_client, load_test_collection):
     assert "newkeyword" in get_coll.keywords
 
 
-@pytest.mark.asyncio
 async def test_delete_collection(app_client, load_test_collection):
     in_coll = load_test_collection
 
@@ -51,7 +47,6 @@ async def test_delete_collection(app_client, load_test_collection):
     assert resp.status_code == 404
 
 
-@pytest.mark.asyncio
 async def test_create_item(app_client, load_test_data: Callable, load_test_collection):
     coll = load_test_collection
 
@@ -73,7 +68,6 @@ async def test_create_item(app_client, load_test_data: Callable, load_test_colle
     assert in_item.dict(exclude={"links"}) == get_item.dict(exclude={"links"})
 
 
-@pytest.mark.asyncio
 async def test_update_item(app_client, load_test_collection, load_test_item):
     coll = load_test_collection
     item = load_test_item
@@ -91,7 +85,6 @@ async def test_update_item(app_client, load_test_collection, load_test_item):
     assert get_item.properties.description == "Update Test"
 
 
-@pytest.mark.asyncio
 async def test_delete_item(app_client, load_test_collection, load_test_item):
     coll = load_test_collection
     item = load_test_item
@@ -103,7 +96,6 @@ async def test_delete_item(app_client, load_test_collection, load_test_item):
     assert resp.status_code == 404
 
 
-@pytest.mark.asyncio
 async def test_get_collection_items(app_client, load_test_collection, load_test_item):
     coll = load_test_collection
     item = load_test_item

stac_fastapi/pgstac/tests/conftest.py

@@ -118,7 +118,6 @@ def api_client(pg):
     return api
 
 
-@pytest.mark.asyncio
 @pytest.fixture(scope="session")
 async def app(api_client):
     time.time()
@@ -130,7 +129,6 @@ async def app(api_client):
     await close_db_connection(app)
 
 
-@pytest.mark.asyncio
 @pytest.fixture(scope="session")
 async def app_client(app):
     async with AsyncClient(app=app, base_url="http://test") as c:

stac_fastapi/pgstac/tests/resources/test_collection.py

@@ -1,11 +1,9 @@
 from typing import Callable
 
 import pystac
-import pytest
 from stac_pydantic import Collection
 
 
-@pytest.mark.asyncio
 async def test_create_collection(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     in_coll = Collection.parse_obj(in_json)
@@ -22,7 +20,6 @@ async def test_create_collection(app_client, load_test_data: Callable):
     assert post_coll.dict(exclude={"links"}) == get_coll.dict(exclude={"links"})
 
 
-@pytest.mark.asyncio
 async def test_update_collection(app_client, load_test_data, load_test_collection):
     in_coll = load_test_collection
     in_coll.keywords.append("newkeyword")
@@ -38,7 +35,6 @@ async def test_update_collection(app_client, load_test_data, load_test_collectio
     assert "newkeyword" in get_coll.keywords
 
 
-@pytest.mark.asyncio
 async def test_delete_collection(
     app_client, load_test_data: Callable, load_test_collection
 ):
@@ -51,7 +47,6 @@ async def test_delete_collection(
     assert resp.status_code == 404
 
 
-@pytest.mark.asyncio
 async def test_create_collection_conflict(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     Collection.parse_obj(in_json)
@@ -68,15 +63,13 @@ async def test_create_collection_conflict(app_client, load_test_data: Callable):
     assert resp.status_code == 409
 
 
-@pytest.mark.asyncio
 async def test_delete_missing_collection(
     app_client,
 ):
     resp = await app_client.delete("/collections")
     assert resp.status_code == 405
 
 
-@pytest.mark.asyncio
 async def test_update_new_collection(app_client, load_test_collection):
     in_coll = load_test_collection
     in_coll.id = "test-updatenew"
@@ -85,15 +78,13 @@ async def test_update_new_collection(app_client, load_test_collection):
     assert resp.status_code == 404
 
 
-@pytest.mark.asyncio
 async def test_nocollections(
     app_client,
 ):
     resp = await app_client.get("/collections")
     assert resp.status_code == 200
 
 
-@pytest.mark.asyncio
 async def test_returns_valid_collection(app_client, load_test_data):
     """Test updating a collection which already exists"""
     in_json = load_test_data("test_collection.json")
@@ -117,7 +108,6 @@ async def test_returns_valid_collection(app_client, load_test_data):
     collection.validate()
 
 
-@pytest.mark.asyncio
 async def test_returns_valid_links_in_collections(app_client, load_test_data):
     """Test links from listing collections"""
     in_json = load_test_data("test_collection.json")
@@ -166,7 +156,6 @@ async def test_returns_valid_links_in_collections(app_client, load_test_data):
     ] == []
 
 
-@pytest.mark.asyncio
 async def test_returns_license_link(app_client, load_test_collection):
     coll = load_test_collection
 

stac_fastapi/pgstac/tests/resources/test_conformance.py

@@ -44,7 +44,6 @@ def test_landing_page_health(response):
 ]
 
 
-@pytest.mark.asyncio
 @pytest.mark.parametrize("rel_type,expected_media_type,expected_path", link_tests)
 async def test_landing_page_links(
     response_json: Dict, app_client, rel_type, expected_media_type, expected_path