diff --git a/integrationtests/example_script.py b/integrationtests/example_script.py index 6a03bd102a8a2989cf70e6ed1954d7cc93d6130d..f6e9b498ff97638cb4105e019424c0c677a7f414 120000 --- a/integrationtests/example_script.py +++ b/integrationtests/example_script.py @@ -1 +1 @@ -../src/caosadvancedtools/examples/example_script.py \ No newline at end of file +../src/caosadvancedtools/serverside/examples/example_script.py \ No newline at end of file diff --git a/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/plot.py b/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/plot.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c99b82a33e496eb31cf7fdc354767fe31919033 100644 --- a/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/plot.py +++ b/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/plot.py @@ -0,0 +1 @@ +import plot diff --git a/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/results.pdf b/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/results.pdf index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..09157f2c0961d412efea36ea0e56db5aac03fd36 100644 Binary files a/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/results.pdf and b/integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03/results.pdf differ diff --git a/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/datafile.dat b/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/datafile.dat index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e29553fe01c8706e15a042e5ac6f85ed1a2cc8ce 100644 --- a/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/datafile.dat +++ b/integrationtests/extroot/ExperimentalData/2010_TestProject/2019-02-03/datafile.dat @@ -0,0 +1 @@ +datadatadata diff --git a/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/poster.pdf b/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/poster.pdf index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..09157f2c0961d412efea36ea0e56db5aac03fd36 100644 Binary files a/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/poster.pdf and b/integrationtests/extroot/Publications/Posters/2019-02-03_really_cool_finding/poster.pdf differ diff --git a/integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_v0.1/plot.py b/integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_v0.1/plot.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c99b82a33e496eb31cf7fdc354767fe31919033 100644 --- a/integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_v0.1/plot.py +++ b/integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_v0.1/plot.py @@ -0,0 +1 @@ +import plot diff --git a/integrationtests/extroot/Software/2020NewProject0X/2020-02-03/plot.py b/integrationtests/extroot/Software/2020NewProject0X/2020-02-03/plot.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c99b82a33e496eb31cf7fdc354767fe31919033 100644 --- a/integrationtests/extroot/Software/2020NewProject0X/2020-02-03/plot.py +++ b/integrationtests/extroot/Software/2020NewProject0X/2020-02-03/plot.py @@ -0,0 +1 @@ +import plot diff --git a/integrationtests/extroot/Software/2020NewProject0X/2020-02-04/plot.py b/integrationtests/extroot/Software/2020NewProject0X/2020-02-04/plot.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c99b82a33e496eb31cf7fdc354767fe31919033 100644 --- a/integrationtests/extroot/Software/2020NewProject0X/2020-02-04/plot.py +++ b/integrationtests/extroot/Software/2020NewProject0X/2020-02-04/plot.py @@ -0,0 +1 @@ +import plot diff --git a/integrationtests/test_im_und_export.py b/integrationtests/test_im_und_export.py index 27995080aa5cbeeb6f562226d4f0c0ca19c64d83..8ea45fd2cebbcb2c3be6c8cb79805204486f7862 100644 --- a/integrationtests/test_im_und_export.py +++ b/integrationtests/test_im_und_export.py @@ -12,10 +12,12 @@ if __name__ == "__main__": directory = TemporaryDirectory() export_related_to(rec.id, directory=directory.name) # delete everything + print("Clearing database") recs = db.execute_query("FIND entity with id>99") recs.delete() assert 0 == len(db.execute_query("FIND File which is stored at " "**/poster.pdf")) + print("Importing stored elements") import_xml(os.path.join(directory.name, "caosdb_data.xml"), interactive=False) # The following tests the existence of some required entities. @@ -26,3 +28,4 @@ if __name__ == "__main__": db.execute_query("FIND RecordType Person", unique=True) db.execute_query("FIND Record Person with firstname=Only", unique=True) db.execute_query("FIND File which is stored at **/poster.pdf", unique=True) + print("Found all required Records and Files.")