fix-tests

SwissDataScienceCenter · Sep 9, 2021 · b7d0c43 · b7d0c43
1 parent 9de4bf8
commit b7d0c43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/renku/core/metadata/gateway/activity_gateway.py b/renku/core/metadata/gateway/activity_gateway.py
@@ -74,7 +74,7 @@ def get_downstream_activity_chains(self, activity: Activity) -> List[Tuple[Activ
         activity_catalog = database["activity-catalog"]
         tok = activity_catalog.tokenizeQuery
         downstream_chains = activity_catalog.findRelationChains(tok(upstream=activity))
-        downstream_chains = [tuple(adr.downstream[0] for adr in d) for d in downstream_chains]
+        downstream_chains = [tuple(r.downstream for r in c) for c in downstream_chains]
 
         return downstream_chains
 
@@ -85,7 +85,7 @@ def get_upstream_activity_chains(self, activity: Activity) -> List[Tuple[Activit
         activity_catalog = database["activity-catalog"]
         tok = activity_catalog.tokenizeQuery
         upstream_chains = activity_catalog.findRelationChains(tok(downstream=activity))
-        upstream_chains = [tuple(adr.upstream[0] for adr in d) for d in upstream_chains]
+        upstream_chains = [tuple(r.upstream for r in c) for c in upstream_chains]
 
         return upstream_chains
 
@@ -143,10 +143,12 @@ def update_latest_activity_by_plan(plan):
                 downstreams.extend(by_usage[generation.entity.path])
 
         if upstreams:
-            database["activity-catalog"].index(ActivityDownstreamRelation(downstream=[activity], upstream=upstreams))
+            for s in upstreams:
+                database["activity-catalog"].index(ActivityDownstreamRelation(downstream=activity, upstream=s))
 
         if downstreams:
-            database["activity-catalog"].index(ActivityDownstreamRelation(downstream=downstreams, upstream=[activity]))
+            for s in downstreams:
+                database["activity-catalog"].index(ActivityDownstreamRelation(downstream=s, upstream=activity))
 
         assert isinstance(activity.association.plan, Plan)
 

diff --git a/renku/core/metadata/gateway/database_gateway.py b/renku/core/metadata/gateway/database_gateway.py
@@ -113,18 +113,10 @@ def initialize(self) -> None:
 
         activity_catalog = Catalog(dump_downstream_relations, load_downstream_relations, btree=BTrees.family32.OO)
         activity_catalog.addValueIndex(
-            IActivityDownstreamRelation["downstream"],
-            dump_activity,
-            load_activity,
-            btree=BTrees.family32.OO,
-            multiple=True,
+            IActivityDownstreamRelation["downstream"], dump_activity, load_activity, btree=BTrees.family32.OO
         )
         activity_catalog.addValueIndex(
-            IActivityDownstreamRelation["upstream"],
-            dump_activity,
-            load_activity,
-            btree=BTrees.family32.OO,
-            multiple=True,
+            IActivityDownstreamRelation["upstream"], dump_activity, load_activity, btree=BTrees.family32.OO
         )
         activity_catalog.addDefaultQueryFactory(downstream_transitive_factory)
 

diff --git a/tests/cli/test_rerun.py b/tests/cli/test_rerun.py
@@ -87,7 +87,7 @@ def rerun():
 
 
 @pytest.mark.parametrize("source, content", [("input1", "input1 new-input2 old"), ("input2", "input1 old-input2 new")])
-def test_rerun_with_inputs_with_from(project, renku_cli, source, content):
+def test_rerun_with_from(project, renku_cli, source, content):
     """Test file recreation with specified inputs."""
     repo = git.Repo(project)
     cwd = Path(project)