From 54aab5dd0d856c04a40640b260ddfee91aaff200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com> Date: Wed, 18 Oct 2023 10:26:26 +0200 Subject: [PATCH] test --- integrationtests/test_cache.py | 5 ++++- src/caosadvancedtools/cache.py | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/integrationtests/test_cache.py b/integrationtests/test_cache.py index b6b72e0e..eb970cd0 100644 --- a/integrationtests/test_cache.py +++ b/integrationtests/test_cache.py @@ -64,8 +64,11 @@ class CacheTest(unittest.TestCase): update = UpdateCache(db_file=self.cache) run_id = "a" print(db.execute_query("FIND Record TestRecord", unique=True)) - print(db.execute_query("FIND Record "+str(rec.id), unique=True)) print(db.execute_query("FIND entity with id="+str(rec.id), unique=True)) + try: + print(db.execute_query("FIND Record "+str(rec.id), unique=True)) + except: + print("Query does not work as expected") update.insert(cont, run_id) assert len(update.get_updates(run_id)) == 1 diff --git a/src/caosadvancedtools/cache.py b/src/caosadvancedtools/cache.py index 2b79f9ae..cf74e330 100644 --- a/src/caosadvancedtools/cache.py +++ b/src/caosadvancedtools/cache.py @@ -27,16 +27,15 @@ # something to replace this. import os import sqlite3 -from copy import deepcopy +import tempfile +import warnings from abc import ABC, abstractmethod +from copy import deepcopy from hashlib import sha256 -import warnings import caosdb as db from lxml import etree -import tempfile - def put_in_container(stuff): if isinstance(stuff, list): @@ -344,7 +343,7 @@ class UpdateCache(AbstractCache): old_ones = db.Container() for ent in cont: - old_ones.append(db.execute_query("FIND ENTITY {}".format(ent.id), + old_ones.append(db.execute_query("FIND ENTITY WITH ID={}".format(ent.id), unique=True)) return old_ones -- GitLab