Skip to content

Commit ddf3ac7

Browse files
authored
try to fix flaky tests (#3)
implement `Job.__eq__()
1 parent f412b61 commit ddf3ac7

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ dependencies = [
3636
[project.optional-dependencies]
3737
zones = [
3838
"mapchete",
39-
"shapely",
40-
"tilematrix"
4139
]
4240
test = [
4341
"mapchete_hub>=2023.12.0",

src/mapchete_hub_cli/job.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ def __repr__(self): # pragma: no cover
7373
def __hash__(self):
7474
return hash(self.job_id)
7575

76+
def __eq__(self, other):
77+
if not isinstance(other, Job): # pragma: no cover
78+
return False
79+
return self.job_id == other.job_id
80+
7681
def _update(self, job: Job):
7782
self.status = job.status
7883
self._dict = job._dict

tests/test_client.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,15 @@ def test_list_jobs_from_date(mhub_client, example_config_json):
196196
)
197197
).job_id
198198

199-
now = datetime.datetime.utcfromtimestamp(time.time()).strftime("%Y-%m-%dT%H:%M:%SZ")
199+
now = datetime.datetime.fromtimestamp(time.time(), datetime.timezone.utc).strftime(
200+
"%Y-%m-%dT%H:%M:%SZ"
201+
)
200202
jobs = mhub_client.jobs(from_date=now)
201203
assert job_id in jobs
202204

203-
future = datetime.datetime.utcfromtimestamp(time.time() + 60).strftime(
204-
"%Y-%m-%dT%H:%M:%SZ"
205-
)
205+
future = datetime.datetime.fromtimestamp(
206+
time.time() + 60, datetime.timezone.utc
207+
).strftime("%Y-%m-%dT%H:%M:%SZ")
206208
jobs = mhub_client.jobs(from_date=future)
207209
assert job_id not in jobs
208210

@@ -215,15 +217,15 @@ def test_list_jobs_to_date(mhub_client, example_config_json):
215217
)
216218
).job_id
217219

218-
now = datetime.datetime.utcfromtimestamp(time.time() + 60).strftime(
219-
"%Y-%m-%dT%H:%M:%SZ"
220-
)
220+
now = datetime.datetime.fromtimestamp(
221+
time.time() + 60, datetime.timezone.utc
222+
).strftime("%Y-%m-%dT%H:%M:%SZ")
221223
jobs = mhub_client.jobs(to_date=now)
222224
assert job_id in jobs
223225

224-
past = datetime.datetime.utcfromtimestamp(time.time() - 60).strftime(
225-
"%Y-%m-%dT%H:%M:%SZ"
226-
)
226+
past = datetime.datetime.fromtimestamp(
227+
time.time() - 60, datetime.timezone.utc
228+
).strftime("%Y-%m-%dT%H:%M:%SZ")
227229
jobs = mhub_client.jobs(to_date=past)
228230
assert job_id not in jobs
229231

0 commit comments

Comments
 (0)