Skip to content

Commit e1eaa8c

Browse files
committed
fix modified job patch schema definition to refer to expected execute parameters
1 parent 748ef59 commit e1eaa8c

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

tests/wps_restapi/test_jobs.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1929,11 +1929,13 @@ def test_job_update_execution_parameters(self):
19291929
"""
19301930
Test modification of the execution ``return`` and ``response`` options, going back-and-forth between approaches.
19311931
"""
1932+
test_inputs = {"message": "test"}
1933+
test_outputs = {"result": {"transmissionMode": ExecuteTransmissionMode.VALUE}}
19321934
new_job = self.make_job(
19331935
task_id=self.fully_qualified_test_name(), process=self.process_public.identifier, service=None,
19341936
status=Status.CREATED, progress=0, access=Visibility.PUBLIC,
1935-
execute_mode=ExecuteMode.AUTO,
1936-
execute_response=ExecuteResponse.DOCUMENT,
1937+
execute_mode=ExecuteMode.AUTO, execute_response=ExecuteResponse.DOCUMENT,
1938+
inputs=test_inputs, outputs=test_outputs,
19371939
)
19381940

19391941
body = {}
@@ -1950,6 +1952,8 @@ def test_job_update_execution_parameters(self):
19501952
assert resp.json["mode"] == ExecuteMode.AUTO
19511953
assert resp.json["response"] == ExecuteResponse.RAW
19521954
assert resp.json["headers"]["Prefer"] == f"return={ExecuteReturnPreference.REPRESENTATION}"
1955+
assert resp.json["inputs"] == test_inputs
1956+
assert resp.json["outputs"] == test_outputs
19531957

19541958
body = {"response": ExecuteResponse.DOCUMENT}
19551959
path = f"/jobs/{new_job.id}"
@@ -1962,6 +1966,8 @@ def test_job_update_execution_parameters(self):
19621966
assert resp.json["mode"] == ExecuteMode.AUTO
19631967
assert resp.json["response"] == ExecuteResponse.DOCUMENT
19641968
assert resp.json["headers"]["Prefer"] == f"return={ExecuteReturnPreference.MINIMAL}"
1969+
assert resp.json["inputs"] == test_inputs
1970+
assert resp.json["outputs"] == test_outputs
19651971

19661972
body = {}
19671973
headers = {
@@ -1977,6 +1983,8 @@ def test_job_update_execution_parameters(self):
19771983
assert resp.json["mode"] == ExecuteMode.AUTO
19781984
assert resp.json["response"] == ExecuteResponse.RAW
19791985
assert resp.json["headers"]["Prefer"] == f"return={ExecuteReturnPreference.REPRESENTATION}"
1986+
assert resp.json["inputs"] == test_inputs
1987+
assert resp.json["outputs"] == test_outputs
19801988

19811989
body = {"response": ExecuteResponse.RAW}
19821990
path = f"/jobs/{new_job.id}"
@@ -1989,6 +1997,8 @@ def test_job_update_execution_parameters(self):
19891997
assert resp.json["mode"] == ExecuteMode.AUTO
19901998
assert resp.json["response"] == ExecuteResponse.RAW
19911999
assert resp.json["headers"]["Prefer"] == f"return={ExecuteReturnPreference.REPRESENTATION}"
2000+
assert resp.json["inputs"] == test_inputs
2001+
assert resp.json["outputs"] == test_outputs
19922002

19932003
@pytest.mark.oap_part4
19942004
def test_job_update_subscribers(self):

weaver/wps_restapi/swagger_definitions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6754,7 +6754,7 @@ class JobTitleNullable(OneOfKeywordSchema):
67546754
]
67556755

67566756

6757-
class PatchJobBodySchema(Execute):
6757+
class PatchJobBodySchema(ExecuteParameters):
67586758
description = "Execution request contents to be updated."
67596759
# 'missing=null' ensures that, if a field is provided with an "empty" definition (JSON null, no-field dict, etc.),
67606760
# contents are passed down as is rather than dropping them (what 'missing=drop' would do due to DropableSchemaNode)

0 commit comments

Comments
 (0)