From 636cd5c53ced895068f78badd09683391e91d6b0 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Tue, 21 Mar 2023 16:20:17 +0100
Subject: [PATCH] MAINT: Assert that auto-inserted files do not have names.
---
CHANGELOG.md | 1 +
README.md | 2 +-
tests/test_file.py | 14 +++++++-------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3abb914..c2e7c4e 100644
--- a/CHANGELOG.md
+++ b/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)
diff --git a/README.md b/README.md
index 4597556..043e03c 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,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).
diff --git a/tests/test_file.py b/tests/test_file.py
index e1e662b..e8ff621 100644
--- a/tests/test_file.py
+++ b/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:
--
GitLab