Skip to content

Commit d11a0e1

Browse files
committed
Merge remote-tracking branch 'origin/master' into issue838_enforece_limited_queue
2 parents d485939 + 3d3ca1c commit d11a0e1

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616

1717
- Internal reorganization of `openeo.extra.job_management` submodule to ease future development ([#741](https://github.com/Open-EO/openeo-python-client/issues/741))
1818
- `openeo.Connection`: add some more HTTP error codes to the default retry list: `502 Bad Gateway`, `503 Service Unavailable` and `504 Gateway Timeout` ([#835](https://github.com/Open-EO/openeo-python-client/issues/835))
19+
- `MultiBackendJobManager`: don't count "created" jobs as "running"
1920

2021
### Removed
2122

tests/extra/job_management/test_manager.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,15 @@ def test_start_job_thread_basic(self, tmp_path, job_manager, job_manager_root_di
281281
("job-2019", "finished", "foo", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
282282
("job-2020", "finished", "bar", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
283283
("job-2021", "finished", "bar", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
284-
("job-2022", "finished", "foo", "1234.5 cpu-seconds", "34567.89 mb-seconds", "2345 seconds", 123),
284+
(
285+
"job-2022",
286+
"finished",
287+
dirty_equals.IsOneOf("foo", "bar"),
288+
"1234.5 cpu-seconds",
289+
"34567.89 mb-seconds",
290+
"2345 seconds",
291+
123,
292+
),
285293
]
286294

287295
# Check downloaded results and metadata.

0 commit comments

Comments
 (0)