Skip to content

Commit 2108f65

Browse files
authored
test: fix deal precondition failure in IT (#3367)
1 parent f1d139b commit 2108f65

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

renku/core/migration/utils/conversion.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from urllib.parse import urlparse
2222

2323
from renku.core.migration.models import v9 as old_datasets
24+
from renku.core.util.datetime8601 import fix_datetime
2425
from renku.core.util.git import get_entity_from_revision
2526
from renku.core.util.urls import get_slug
2627
from renku.domain_model.dataset import (
@@ -192,10 +193,10 @@ def convert_license(license):
192193
Dataset(
193194
creators=[_convert_agent(creator) for creator in dataset.creators],
194195
dataset_files=convert_dataset_files(dataset.files),
195-
date_created=dataset.date_created,
196-
date_published=dataset.date_published,
196+
date_created=fix_datetime(dataset.date_created),
197+
date_published=fix_datetime(dataset.date_published),
197198
date_removed=None,
198-
date_modified=dataset.date_created or dataset.date_published,
199+
date_modified=fix_datetime(dataset.date_created or dataset.date_published),
199200
derived_from=convert_derived_from(dataset.derived_from, dataset.same_as),
200201
description=dataset.description,
201202
id=id,

renku/domain_model/dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,8 @@ def replace_identifier(self, identifier: Optional[str] = None):
550550
or (self.date_created is None and self.date_published is not None)
551551
)
552552
@deal.ensure(
553-
lambda self, *_, result, **kwargs: self.date_modified >= self.date_created
554-
or self.date_modified >= self.date_published
553+
lambda self, *_, result, **kwargs: (self.date_created is not None and self.date_modified >= self.date_created)
554+
or (self.date_published is not None and self.date_modified >= self.date_published)
555555
)
556556
@deal.ensure(lambda self, *_, result, **kwargs: self.derived_from is not None)
557557
def derive_from(

renku/infrastructure/gateway/dataset_gateway.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ def remove_tag(self, dataset: Dataset, tag: DatasetTag):
7171
tags.remove(t)
7272
break
7373

74-
@deal.pre(
75-
lambda _: _.dataset.date_created is None or _.dataset.date_created >= project_context.project.date_created
76-
)
77-
@deal.pre(
78-
lambda _: _.dataset.date_published is None or _.dataset.date_published >= project_context.project.date_created
79-
)
74+
# NOTE: Enable this again once we properly deal with `date_created` on imported Renku datasets
75+
# @deal.pre(
76+
# lambda _: _.dataset.date_created is None or _.dataset.date_created >= project_context.project.date_created
77+
# )
8078
def add_or_remove(self, dataset: Dataset) -> None:
8179
"""Add or remove a dataset."""
8280
database = project_context.database

0 commit comments

Comments
 (0)