Fix tests requiring database timezone to be UTC

Author: omad

cubedash/testutils/database.py

@@ -147,6 +147,12 @@ def odc_test_db(cfg_env):
     # during testing, and need any performance gains we can get.
 
     with index._db._engine.begin() as conn:  # type: ignore[attr-defined]
+        # Some tests are sensitive to the timezone of the database, and expect it to be UTC
+        quoted_db_name = conn.dialect.identifier_preparer.quote(
+            index._db._engine.url.database  # type: ignore[attr-defined]
+        )
+        conn.execute(text(f"ALTER DATABASE {quoted_db_name} SET timezone TO 'UTC'"))
+
         if index.name == "pg_index":
             for table in [
                 "agdc.dataset_location",

integration_tests/test_page_loads.py

@@ -790,9 +790,11 @@ def test_invalid_product_returns_not_found(client: FlaskClient) -> None:
 
 
 @pytest.mark.parametrize("env_name", ("default",), indirect=True)
-def test_show_summary_cli(clirunner, client: FlaskClient, fix_utc_timezone) -> None:
+def test_show_summary_cli(clirunner, client: FlaskClient) -> None:
     """
     You should be able to view a product with cubedash-view command-line program.
+
+    This test expects the database timezone to be UTC
     """
     # ls7_nbar_scene, 2017, May
     res = clirunner(show.cli, ["ls7_nbar_scene", "2017", "5"])
@@ -810,7 +812,8 @@ def test_show_summary_cli(clirunner, client: FlaskClient, fix_utc_timezone) -> N
             f"  to {expected_to.isoformat()} ",
         )
     )
-    assert res.output.startswith(expected_header)
+    result_header = "\n".join(res.output.splitlines()[:5])
+    assert expected_header == result_header
     expected_metadata = "\n".join(  # noqa: FLY002
         (
             "Metadata",

integration_tests/test_stac.py

@@ -632,10 +632,12 @@ def test_arrivals_page_validation(stac_client: FlaskClient) -> None:
 
 
 @pytest.mark.parametrize("env_name", ("default",), indirect=True)
-def test_stac_collection(stac_client: FlaskClient, fix_utc_timezone):
+def test_stac_collection(stac_client: FlaskClient):
     """
     Follow the links to the "high_tide_comp_20p" collection and ensure it includes
     all of our tests data.
+
+    This test expects the database timezone to be UTC
     """
 
     collections = get_json(stac_client, "/stac")