Skip to content

Commit 0680c07

Browse files
committed
fixup! fixup! fixup! fixup! Issue #195 add log level to log responses
1 parent ec76cd7 commit 0680c07

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed

openeo_driver/dummy/dummy_backend.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ def get_log_entries(
940940
requested_level = normalize_log_level(level)
941941
for log in self._custom_job_logs.get(job_id, default_logs):
942942
if isinstance(log, dict):
943-
actual_level = normalize_log_level(log.get("log_level"))
943+
actual_level = normalize_log_level(log.get("level"))
944944
if actual_level < requested_level:
945945
continue
946946
yield log

openeo_driver/testing.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,11 @@ def ensure_auth_header(self):
206206
if not self.default_request_headers.get("Authorization"):
207207
self.set_auth_bearer_token()
208208

209-
def get(self, path: str, headers: dict = None) -> ApiResponse:
209+
def get(self, path: str, headers: dict = None, params: Optional[dict] = None) -> ApiResponse:
210210
"""Do versioned GET request, given non-versioned path"""
211-
return ApiResponse(self.client.get(path=self.url(path), headers=self._request_headers(headers)))
211+
return ApiResponse(
212+
self.client.get(path=self.url(path), headers=self._request_headers(headers), query_string=params)
213+
)
212214

213215
def head(self, path: str, headers: dict = None) -> ApiResponse:
214216
"""Do versioned GET request, given non-versioned path"""

tests/test_views.py

+22-2
Original file line numberDiff line numberDiff line change
@@ -3057,10 +3057,30 @@ def test_get_batch_job_logs(self, api):
30573057
assert resp.assert_status_code(200).json == {
30583058
"level": "debug",
30593059
"logs": [
3060-
{"id": "1", "level": "info", "message": "hello world"}
3060+
{"id": "1", "level": "info", "message": "hello world"},
30613061
],
3062-
"links": []
3062+
"links": [],
3063+
}
3064+
3065+
def test_get_batch_job_logs_level(self, api):
3066+
log_db = {
3067+
"07024ee9-7847-4b8a-b260-6c879a2b3cdc": [
3068+
{"id": "1", "level": "info", "message": "howdy world"},
3069+
{"id": "2", "level": "error", "message": "oh no"},
3070+
]
30633071
}
3072+
with self._fresh_job_registry():
3073+
with mock.patch.dict(dummy_backend.DummyBatchJobs._custom_job_logs, log_db):
3074+
resp = api.get(
3075+
"/jobs/07024ee9-7847-4b8a-b260-6c879a2b3cdc/logs",
3076+
headers=self.AUTH_HEADER,
3077+
params={"level": "warning"},
3078+
)
3079+
assert resp.assert_status_code(200).json == {
3080+
"level": "warning",
3081+
"logs": [{"id": "2", "level": "error", "message": "oh no"}],
3082+
"links": [],
3083+
}
30643084

30653085
def test_get_batch_job_logs_failure(self, api):
30663086
with self._fresh_job_registry():

0 commit comments

Comments
 (0)