From 9cc4d2d5db6fe0e65a82681081e471daa7de8bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Mon, 12 Sep 2022 09:18:09 +0200
Subject: [PATCH] MAINT: use clear_database and set_test_key from pylib
---
integrationtests/basic_example/test_basic.py | 12 +++---------
integrationtests/test_realworld_example.py | 14 ++------------
.../test_use_case_simple_presentation.py | 14 ++------------
3 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/integrationtests/basic_example/test_basic.py b/integrationtests/basic_example/test_basic.py
index b24a1c65..dd07cd35 100755
--- a/integrationtests/basic_example/test_basic.py
+++ b/integrationtests/basic_example/test_basic.py
@@ -25,7 +25,7 @@
#
"""
-module description
+basic crawler tests
"""
from caosadvancedtools.crawler import Crawler as OldCrawler
@@ -40,10 +40,9 @@ from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
import pytest
from caosadvancedtools.models.parser import parse_model_from_yaml
import yaml
+from caosdb.utils.register_tests import set_test_key, clear_database
-# TODO is not yet merged in caosadvancedtools
-#from caosadvancedtools.testutils import clear_database, set_test_key
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
def rfp(*pathcomponents):
@@ -54,11 +53,6 @@ def rfp(*pathcomponents):
return os.path.join(os.path.dirname(__file__), *pathcomponents)
-@pytest.fixture
-def clear_database():
- db.execute_query("FIND Entity").delete()
-
-
@pytest.fixture
def usemodel():
model = parse_model_from_yaml(rfp("model.yml"))
diff --git a/integrationtests/test_realworld_example.py b/integrationtests/test_realworld_example.py
index 5ec2f321..23a47351 100644
--- a/integrationtests/test_realworld_example.py
+++ b/integrationtests/test_realworld_example.py
@@ -36,11 +36,10 @@ from caoscrawler.structure_elements import File, JSONFile, Directory
import pytest
from caosadvancedtools.models.parser import parse_model_from_json_schema, parse_model_from_yaml
-#from caosadvancedtools.testutils import clear_database, set_test_key
+from caosdb.utils.register_tests import clear_database, set_test_key
import sys
-# TODO is not yet merged in caosadvancedtools
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
def rfp(*pathcomponents):
@@ -72,15 +71,6 @@ def usemodel():
dataset_inherits.sync_data_model(noquestion=True)
-@pytest.fixture
-def clear_database():
- # TODO(fspreck): Remove once the corresponding advancedtools function can
- # be used.
- ents = db.execute_query("FIND ENTITY WITH ID>99")
- if ents:
- ents.delete()
-
-
def create_identifiable_adapter():
ident = CaosDBIdentifiableAdapter()
ident.register_identifiable("license", (
diff --git a/integrationtests/test_use_case_simple_presentation.py b/integrationtests/test_use_case_simple_presentation.py
index f1c838d1..b4dd777a 100644
--- a/integrationtests/test_use_case_simple_presentation.py
+++ b/integrationtests/test_use_case_simple_presentation.py
@@ -32,26 +32,16 @@ from subprocess import run
import caosdb as db
from caosadvancedtools.loadFiles import loadpath
from caosadvancedtools.models import parser as parser
+from caosdb.utils.register_tests import clear_database, set_test_key
from caoscrawler.crawl import main as crawler_main
-# TODO(fspreck) Re-eneable once this is part of dev in advancedusertools.
-# from caosadvancedtools.testutils import clear_database, set_test_key
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
DATADIR = os.path.join(os.path.dirname(__file__), "test_data",
"extroot", "use_case_simple_presentation")
-@pytest.fixture
-def clear_database():
- # TODO(fspreck): Remove once the corresponding advancedtools function can be
- # used.
- ents = db.execute_query("FIND ENTITY WITH ID>99")
- if ents:
- ents.delete()
-
-
def test_complete_crawler(
clear_database
):
--
GitLab