Skip to content

Commit

Permalink
fixup! Issue #297 Improve compliance with 'remote-udp' extension
Browse files Browse the repository at this point in the history
  • Loading branch information
@soxofaan
soxofaan committed Jul 8, 2024
1 parent 27d6587 commit 908697a
Showing 1 changed file with 82 additions and 36 deletions.
118 changes: 82 additions & 36 deletions tests/test_views_execute.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2686,77 +2686,115 @@ def test_discard_result(api):
assert res.json is None


@pytest.mark.parametrize(["namespace", "url_mocks", "expected_error"], [
(
"https://oeo.test/u/42/udp/bbox_mol",
{"https://oeo.test/u/42/udp/bbox_mol": "udp/bbox_mol.json"},
@pytest.mark.parametrize(
["namespace", "url_mocks", "expected_error"],
[
pytest.param(
"https://share.test/u42/bbox_mol.json",
{"https://share.test/u42/bbox_mol.json": "udp/bbox_mol.json"},
None,
),
(
"https://share.example/u42/bbox_mol.json",
{"https://share.example/u42/bbox_mol.json": "udp/bbox_mol.json"},
id="basic",
),
pytest.param(
"https://share.test/u42/bbox_mol",
{"https://share.test/u42/bbox_mol": "udp/bbox_mol.json"},
None,
),
(
id="simple-no-extension",
),
pytest.param(
"https://share.test/u42/bbox_mol.json",
{
"https://share.test/u42/bbox_mol.json": (302, "https://shr976.test/45435"),
"https://shr976.test/45435": "udp/bbox_mol.json",
},
None,
),
(
"https://oeo.test/u/42/udp/bbox_mol",
{"https://oeo.test/u/42/udp/bbox_mol": 404},
id="redirect",
),
pytest.param(
"https://share.test/u42/",
{
"https://share.test/u42/": {
"processes": [
{"id": "foo", "process_graph": {}},
load_json("pg/1.0/udp/bbox_mol.json"),
],
"links": [],
}
},
None,
id="process-listing",
),
pytest.param(
"https://share.test/u42/bbox_mol.json",
{"https://share.test/u42/bbox_mol.json": 404},
(
400,
"ProcessNamespaceInvalid",
"Process 'bbox_mol' specified with invalid namespace 'https://oeo.test/u/42/udp/bbox_mol': HTTPError('404 Client Error: Not Found for url: https://oeo.test/u/42/udp/bbox_mol')",
"Process 'bbox_mol' specified with invalid namespace 'https://share.test/u42/bbox_mol.json': HTTPError('404 Client Error: Not Found for url: https://share.test/u42/bbox_mol.json')",
),
),
(
"https://oeo.test/u/42/udp/bbox_mol",
{"https://oeo.test/u/42/udp/bbox_mol": {"foo": "bar"}},
id="error404",
),
pytest.param(
"https://share.test/u42/bbox_mol.json",
{"https://share.test/u42/bbox_mol.json": {"foo": "bar"}},
(
400,
"ProcessNotFound",
"No valid process definition for 'bbox_mol' found at 'https://oeo.test/u/42/udp/bbox_mol'.",
"No valid process definition for 'bbox_mol' found at 'https://share.test/u42/bbox_mol.json'.",
),
id="error-no-id",
),
(
"https://oeo.test/u/42/udp/bbox_mol",
{"https://oeo.test/u/42/udp/bbox_mol": '{"foo": invalid json'},
pytest.param(
"https://share.test/u42/bbox_mol.json",
{"https://share.test/u42/bbox_mol.json": '{"foo": invalid json'},
(
400,
"ProcessNamespaceInvalid",
"Process 'bbox_mol' specified with invalid namespace 'https://oeo.test/u/42/udp/bbox_mol': JSONDecodeError('Expecting value: line 1 column 9 (char 8)')",
"Process 'bbox_mol' specified with invalid namespace 'https://share.test/u42/bbox_mol.json': JSONDecodeError('Expecting value: line 1 column 9 (char 8)')",
),
id="error-invalid-json",
),
(
"https://share.example/u42/bbox_mol.json",
pytest.param(
"https://share.test/u42/bbox_mol.json",
{
"https://share.example/u42/bbox_mol.json": load_json(
"https://share.test/u42/bbox_mol.json": load_json(
"pg/1.0/udp/bbox_mol.json", preprocess=lambda t: t.replace("bbox_mol", "BBox_Mol")
)
},
(
400,
"ProcessIdMismatch",
"Mismatch between expected process 'bbox_mol' and process 'BBox_Mol' defined at 'https://share.example/u42/bbox_mol.json'.",
"Mismatch between expected process 'bbox_mol' and process 'BBox_Mol' defined at 'https://share.test/u42/bbox_mol.json'.",
),
id="error-id-mismatch-capitalization",
),
(
"https://share.example/u42/bbox_mol.json",
pytest.param(
"https://share.test/u42/bbox_mol.json",
{
"https://share.example/u42/bbox_mol.json": load_json(
"https://share.test/u42/bbox_mol.json": load_json(
"pg/1.0/udp/bbox_mol.json", preprocess=lambda t: t.replace("bbox_mol", "BoundingBox-Mol")
)
},
(
400,
"ProcessIdMismatch",
"Mismatch between expected process 'bbox_mol' and process 'BoundingBox-Mol' defined at 'https://share.example/u42/bbox_mol.json'.",
"Mismatch between expected process 'bbox_mol' and process 'BoundingBox-Mol' defined at 'https://share.test/u42/bbox_mol.json'.",
),
id="error-id-mismatch-different-id",
),
pytest.param(
"https://share.test/u42/",
{
"https://share.test/u42/": {
"processes": [
{"id": "foo", "process_graph": {}},
{"id": "bar", "process_graph": {}},
],
"links": [],
}
},
(400, "ProcessNotFound", "Process 'bbox_mol' not found in process listing at 'https://share.test/u42/'."),
id="process-listing-missing",
),
],
)
Expand All @@ -2779,10 +2817,18 @@ def test_evaluate_process_from_url(api, requests_mock, namespace, url_mocks, exp
raise ValueError(value)

# Evaluate process graph (with URL namespace)
pg = api.load_json("udp_bbox_mol_basic.json")
assert pg["bboxmol1"]["process_id"] == "bbox_mol"
pg["bboxmol1"]["namespace"] = namespace

pg = {
"loadcollection1": {
"process_id": "load_collection",
"arguments": {"id": "S2_FOOBAR"},
},
"bboxmol1": {
"process_id": "bbox_mol",
"namespace": namespace,
"arguments": {"data": {"from_node": "loadcollection1"}},
"result": True,
},
}
res = api.result(pg)
if expected_error:
status_code, error_code, message = expected_error
Expand Down

0 comments on commit 908697a

Please sign in to comment.