Merge branch 'f-no-automatic-file-naming' into 'dev'

ENH: Test for issue caosdb-server#192 (automatic name for mass-imported File entities)

See merge request !57

CHANGELOG.md

@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   xfail until
   [caosdb-pylib#34](https://gitlab.com/caosdb/caosdb-pylib/-/issues/34)
   is fixed.
+* Test for [caosdb-server#197](https://gitlab.com/caosdb/caosdb-server/-/issues/197).
 
 ### Deprecated (for soon-to-be removed features)
 

CITATION.cff

+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+  - family-names: Fitschen
+    given-names: Timm
+    orcid: https://orcid.org/0000-0002-4022-432X
+  - family-names: Schlemmer
+    given-names: Alexander
+    orcid: https://orcid.org/0000-0003-4124-9649
+  - family-names: Hornung
+    given-names: Daniel
+    orcid: https://orcid.org/0000-0002-7846-6375
+  - family-names: tom Wörden
+    given-names: Henrik
+    orcid: https://orcid.org/0000-0002-5549-578X
+  - family-names: Spreckelsen
+    given-names: Florian
+    orcid: https://orcid.org/0000-0002-6856-2910
+  - family-names: Parlitz
+    given-names: Ulrich
+    orcid: https://orcid.org/0000-0003-3058-1435
+  - family-names: Luther
+    given-names: Stefan
+    orcid: https://orcid.org/0000-0001-7214-8125
+title: "CaosDB - Server"
+version: 0.8.1
+doi: 10.3390/data4020083
+date-released: 2022-11-07

README.md

@@ -16,6 +16,7 @@ CaosDB project.
 - Modify `pycaosdb.ini.template` and save it as `pycaosdb.ini`, taking care of the following points:
   - Certificates must be valid and be specified in `pycaosdb.ini`.
   - Server-side scripting paths must be given, otherwise server-side scripting will be omitted.
+  - Paths for the file tests must exist, or be creatable by the testing script and the server.
 - Run the tests with `pytest` or `pytest-3` (depending on your system).
 - If you want to run just a single test, you can also select a single test file:  
   `pytest-3 tests/test_issues.py`  
@@ -65,7 +66,7 @@ when creating the merge request. This allows our team to work with you on your r
 
 * Copyright (C) 2018 Research Group Biomedical Physics, Max Planck Institute
   for Dynamics and Self-Organization Göttingen.
-* Copyright (C) 2020-2021 Indiscale GmbH <info@indiscale.com>
+* Copyright (C) 2020-2023 Indiscale GmbH <info@indiscale.com>
 
 All files in this repository are licensed under the [GNU Affero General Public
 License](LICENCE.md) (version 3 or later).

tests/test_file.py

@@ -5,8 +5,8 @@
 #
 # Copyright (C) 2018 Research Group Biomedical Physics,
 # Max-Planck-Institute for Dynamics and Self-Organization Göttingen
-# Copyright (C) 2019 IndiScale GmbH (info@indiscale.com)
-# Copyright (C) 2019 Daniel Hornung (d.hornung@indiscale.com)
+# Copyright (C) 2019-2023 IndiScale GmbH (info@indiscale.com)
+# Copyright (C) 2019-2023 Daniel Hornung (d.hornung@indiscale.com)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -536,7 +536,7 @@ def test_insert_files_in_dir_with_symlink():
         assert_is_not_none(c.messages["Info", 0])
         assert_equal(c.messages["Info", 0][0],
                      "Files count in linked_subfolder/: 1")
-        assert_equal(c[0].name, "test2.dat")
+        assert c[0].name is None
         assert_equal(c[0].path, "/linked_subfolder/test2.dat")
 
         d = models.Container()
@@ -551,7 +551,7 @@ def test_insert_files_in_dir_with_symlink():
         assert_equal(d.messages["Info", 0][0],
                      "Files count in linked_subfolder/: 1")
         assert_true(d[0].is_valid())
-        assert_equal(d[0].name, "test2.dat")
+        assert d[0].name is None
         assert_equal(d[0].path, "/linked_subfolder/test2.dat")
 
     finally:
@@ -633,7 +633,7 @@ def test_insert_files_in_dir():
         # only the new file is given back...
         assert_equal(1, len(e))
         assert_false(e[0].is_valid())
-        assert_equal(e[0].name, "test3.dat")
+        assert e[0].name is None
         assert_equal(e[0].path, "/testfolder/test3.dat")
 
         f = models.Container()
@@ -648,7 +648,7 @@ def test_insert_files_in_dir():
         # only the new file is given back...
         assert_equal(1, len(f))
         assert_true(f[0].is_valid())
-        assert_equal(f[0].name, "test3.dat")
+        assert f[0].name is None
         assert_equal(f[0].path, "/testfolder/test3.dat")
 
     finally:
@@ -700,7 +700,7 @@ def test_insert_files_in_dir_regex():
 
         # the other has been inserted
         assert len(c) == 1
-        assert c[0].name == "test_insert.dat"
+        assert c[0].name is None
 
     finally:
         try: