Merge branch 'f-test-parent' into f-update-parents-mitigation

integrationtests/test_data/extroot/use_case_simple_presentation/cfood.yml

@@ -22,7 +22,6 @@ extroot:
 
           records:
             mdfile:
-              parents: []
               role: File
               path: $DataFile
               file: $DataFile

integrationtests/test_data/extroot/use_case_simple_presentation/model.yml

@@ -17,7 +17,6 @@ ScientificActivity:
       datatype: TEXT
     mdfile:
       description: The file storing information about this record.
-      datatype: FILE
 
 Experiment:
   description: |

integrationtests/test_use_case_simple_presentation.py

@@ -35,23 +35,13 @@ from caosadvancedtools.models import parser as parser
 from caoscrawler.crawl import 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")
+from caosdb.utils.register_tests import clear_database, set_test_key
+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
 ):