From 727ae435f1eaea653da96938164e9097e45b923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com> Date: Tue, 29 Nov 2022 09:40:39 +0100 Subject: [PATCH] TST: fix add_to_remote call --- unittests/test_issues.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/unittests/test_issues.py b/unittests/test_issues.py index 0e024429..6b7b0d52 100644 --- a/unittests/test_issues.py +++ b/unittests/test_issues.py @@ -25,6 +25,7 @@ from pytest import mark import caosdb as db from caoscrawler.crawl import Crawler +from caoscrawler.identifiable import Identifiable from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter from caoscrawler.structure_elements import DictElement from test_tool import rfp @@ -105,8 +106,10 @@ def test_issue_39(): flat_list = [b1, a1, a2, b2] # the two records with ids exist remotely - crawler.add_to_remote_existing_cache(a1) - crawler.add_to_remote_existing_cache(b2) + crawler.add_to_remote_existing_cache(a1, + Identifiable(name="A", record_id=101, record_type="RT_A")) + crawler.add_to_remote_existing_cache(b2, + Identifiable(name="B", record_id=102, record_type="RT_B")) # this would result in a merge conflict before ins, ups = crawler.split_into_inserts_and_updates(flat_list) -- GitLab