TST: use set_test_key

integrationtests/basic_example/test_basic.py

 #!/usr/bin/env python3
 # encoding: utf-8
 #
-# ** header v3.0
 # This file is a part of the CaosDB Project.
 #
 # Copyright (C) 2021 Indiscale GmbH <info@indiscale.com>
@@ -21,11 +20,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
-# ** end header
 #
 
 """
-module description
+an integration test module that does basic integration tests
 """
 
 from caosadvancedtools.crawler import Crawler as OldCrawler
@@ -41,9 +39,8 @@ import pytest
 from caosadvancedtools.models.parser import parse_model_from_yaml
 import yaml
 
-# TODO is not yet merged in caosadvancedtools
-#from caosadvancedtools.testutils import clear_database, set_test_key
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+from caosdb.utils.register_tests import clear_database, set_test_key
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
 
 
 def rfp(*pathcomponents):
@@ -54,11 +51,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"))

integrationtests/test_issues.py

@@ -24,10 +24,8 @@ from caoscrawler.crawl import Crawler
 from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
 from caoscrawler.structure_elements import Dict
 
-
-@fixture
-def clear_database():
-    db.execute_query("FIND ENTITY").delete(raise_exception_on_error=False)
+from caosdb.utils.register_tests import clear_database, set_test_key
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
 
 
 def test_issue_23(clear_database):

integrationtests/test_realworld_example.py

@@ -22,8 +22,9 @@
 #
 
 """
-module description
+an integration test module that runs a test against a (close to) real world example
 """
+from caosdb.utils.register_tests import clear_database, set_test_key
 import json
 import os
 
@@ -36,11 +37,9 @@ 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
 import sys
 
-# TODO is not yet merged in caosadvancedtools
-# set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
+set_test_key("10b128cf8a1372f30aa3697466bb55e76974e0c16a599bb44ace88f19c8f61e2")
 
 
 def rfp(*pathcomponents):

integrationtests/test_use_case_simple_presentation.py

@@ -22,9 +22,6 @@
 # ** end header
 #
 
-"""
-module description
-"""
 import os
 import pytest
 from subprocess import run
@@ -33,25 +30,13 @@ import caosdb as db
 from caosadvancedtools.loadFiles import loadpath
 from caosadvancedtools.models import parser as parser
 from caoscrawler.crawl import crawler_main
+from caosdb.utils.register_tests import clear_database, set_test_key
 
-# TODO: wait for release of this feature in pylib
-# from caosdb.utils.register_tests 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")
 
-# TODO: remove this
-
-
-@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