fix integration tests (#92)

* fix integration tests

* more fixes

Author: malmans2

tests/integration_test_10_catalogue.py

@@ -42,10 +42,10 @@ def test_catalogue_collections_keywords(api_anon_client: ApiClient) -> None:
 
 
 def test_catalogue_collection_submit(collection: Collection) -> None:
-    remote = collection.submit()
+    remote = collection.submit(date="1990-01-01")
     assert isinstance(remote, Remote)
     assert remote.collection_id == "test-adaptor-mars"
-    assert remote.request == {}
+    assert remote.request == {"date": "1990-01-01"}
 
 
 def test_catalogue_collection_begin_datetime(collection: Collection) -> None:

tests/integration_test_20_processing.py

@@ -54,10 +54,10 @@ def test_processing_estimate_costs(api_anon_client: ApiClient) -> None:
     assert "cost" in result
 
 
-def test_processing_get_jobs_satus(api_anon_client: ApiClient) -> None:
-    remote = api_anon_client.submit("test-adaptor-url", foo="bar")
+def test_processing_get_jobs_status(api_anon_client: ApiClient) -> None:
+    remote = api_anon_client.submit("test-adaptor-dummy", format="foo")
     request_uid = remote.request_uid
-    with pytest.raises(HTTPError):
+    with pytest.raises(HTTPError, match="400 Client Error: Bad Request"):
         remote.make_results()
     assert request_uid in api_anon_client.get_jobs(status="failed").job_ids
     assert request_uid not in api_anon_client.get_jobs(status="successful").job_ids

tests/integration_test_30_remote.py

@@ -41,7 +41,11 @@ def test_remote_json(remote: Remote) -> None:
 
 
 def test_remote_request(remote: Remote) -> None:
-    assert remote.request == {"size": 1}
+    assert remote.request == {
+        "elapsed": 0.0,
+        "format": "grib",
+        "size": 1,
+    }
 
 
 def test_remote_request_uid(remote: Remote) -> None:
@@ -53,7 +57,7 @@ def test_remote_status(remote: Remote) -> None:
 
 
 def test_remote_failed(api_anon_client: ApiClient) -> None:
-    remote = api_anon_client.submit("test-adaptor-url", foo="bar")
+    remote = api_anon_client.submit("test-adaptor-dummy", format="foo")
     with pytest.raises(HTTPError, match="400 Client Error: Bad Request"):
         remote.download()
     assert remote.status == "failed"

tests/integration_test_70_legacy_api_client.py

@@ -8,7 +8,6 @@
 
 import pytest
 import requests
-from urllib3.exceptions import InsecureRequestWarning
 
 from cads_api_client import processing
 from cads_api_client.legacy_api_client import LegacyApiClient
@@ -148,42 +147,47 @@ def test_legacy_api_client_wait_until_complete(
 
 
 @pytest.mark.parametrize(
-    "collection_id,raises",
+    "collection_id,format,raises",
     [
-        ("test-adaptor-dummy", does_not_raise()),
-        ("test-adaptor-mars", pytest.raises(Exception, match="400 Client Error")),
+        ("test-adaptor-dummy", "grib", does_not_raise()),
+        (
+            "test-adaptor-dummy",
+            "foo",
+            pytest.raises(Exception, match="400 Client Error"),
+        ),
     ],
 )
 def test_legacy_api_client_update(
     api_root_url: str,
     api_anon_key: str,
     collection_id: str,
+    format: str,
     raises: contextlib.nullcontext[Any],
 ) -> None:
     client = LegacyApiClient(
         url=api_root_url, key=api_anon_key, wait_until_complete=False, retry_max=0
     )
-    remote = client.retrieve(collection_id, {})
+    remote = client.retrieve(collection_id, {"format": format})
     assert isinstance(remote, processing.Remote)
     with raises:
         legacy_update(remote)
 
 
+@pytest.mark.filterwarnings("ignore:Unverified HTTPS")
 def test_legacy_api_client_kwargs(api_root_url: str, api_anon_key: str) -> None:
     session = requests.Session()
-    with pytest.warns(InsecureRequestWarning):
-        client = LegacyApiClient(
-            url=api_root_url,
-            key=api_anon_key,
-            verify=0,
-            timeout=1,
-            progress=False,
-            delete=True,
-            retry_max=2,
-            sleep_max=3,
-            wait_until_complete=False,
-            session=session,
-        )
+    client = LegacyApiClient(
+        url=api_root_url,
+        key=api_anon_key,
+        verify=0,
+        timeout=1,
+        progress=False,
+        delete=True,
+        retry_max=2,
+        sleep_max=3,
+        wait_until_complete=False,
+        session=session,
+    )
     assert client.client.url == api_root_url
     assert client.client.key == api_anon_key
     assert client.client.verify is False

tests/integration_test_80_adaptors.py

@@ -2,6 +2,10 @@
 import filecmp
 import os
 import pathlib
+import zipfile
+
+import pytest
+from requests import HTTPError
 
 from cads_api_client import ApiClient
 
@@ -17,6 +21,38 @@ def test_adaptors_dummy(api_anon_client: ApiClient, tmp_path: pathlib.Path) -> N
     assert os.path.exists(target)
 
 
+def test_adaptors_dummy_cached(
+    api_anon_client: ApiClient, tmp_path: pathlib.Path
+) -> None:
+    collection_id = "test-adaptor-dummy"
+    target_grib = str(tmp_path / "dummy.grib")
+    request = {"size": 1, "_timestamp": datetime.datetime.now().isoformat()}
+    results = api_anon_client.submit_and_wait_on_results(collection_id, **request)
+    assert results.content_type == "application/x-grib"
+    assert results.download(target_grib) == target_grib
+    assert os.path.getsize(target_grib) == 1
+    expected_bytes = open(target_grib, "rb").read()
+
+    target_netcdf = str(tmp_path / "dummy.nc")
+    results = api_anon_client.submit_and_wait_on_results(
+        collection_id, format="netcdf", **request
+    )
+    assert results.content_type == "application/netcdf"
+    assert results.download(target_netcdf) == target_netcdf
+    assert os.path.getsize(target_netcdf) == 1
+    assert expected_bytes == open(target_netcdf, "rb").read()
+
+    target_zip = str(tmp_path / "dummy.zip")
+    results = api_anon_client.submit_and_wait_on_results(
+        collection_id, format="zip", **request
+    )
+    assert results.content_type == "application/zip"
+    assert results.download(target_zip) == target_zip
+    with zipfile.ZipFile(target_zip, "r") as zip_fp:
+        with zip_fp.open("dummy_0.grib", "r") as zip_grib_fs:
+            assert expected_bytes == zip_grib_fs.read()
+
+
 def test_adaptors_url(api_anon_client: ApiClient, tmp_path: pathlib.Path) -> None:
     collection_id = "test-adaptor-url"
     request = {
@@ -37,6 +73,13 @@ def test_adaptors_url(api_anon_client: ApiClient, tmp_path: pathlib.Path) -> Non
     assert filecmp.cmp(target1, target2)
 
 
+def test_adaptors_url_constraints(
+    api_anon_client: ApiClient, tmp_path: pathlib.Path
+) -> None:
+    with pytest.raises(HTTPError, match="400 Client Error: Bad Request"):
+        api_anon_client.submit("test-adaptor-url", foo="bar")
+
+
 def test_adaptors_direct_mars(
     api_anon_client: ApiClient, tmp_path: pathlib.Path
 ) -> None: