From 2524bbf36347e2441e098df954964c1a693e01fd Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Wed, 2 Mar 2022 16:18:32 +0100
Subject: [PATCH] WIP: Pipeline fixing.
---
README_SETUP.md | 3 ++-
integrationtests/test_assure_functions.py | 11 +++++------
src/caosadvancedtools/cfood.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README_SETUP.md b/README_SETUP.md
index 09a368a3..d3331661 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -48,7 +48,8 @@ Optional h5-crawler:
`integrationtest/extroot/` directory.
## Code Formatting
-`autopep8 -i -r ./`
+
+`make style`
## Documentation #
diff --git a/integrationtests/test_assure_functions.py b/integrationtests/test_assure_functions.py
index 56f9767a..9f4e387d 100644
--- a/integrationtests/test_assure_functions.py
+++ b/integrationtests/test_assure_functions.py
@@ -32,26 +32,25 @@ from caosadvancedtools.cfood import (assure_object_is_in_list)
from caosadvancedtools.guard import (global_guard, RETRIEVE, UPDATE)
-def setup_module():
+def setup():
"""Delete all test entities."""
db.execute_query("FIND Test*").delete(raise_exception_on_error=False)
-def setup():
+def setup_module():
"""Allow all updates and delete test data"""
global_guard.level = UPDATE
- setup_module()
+ setup()
-def teardown():
+def teardown_module():
"""Reset guard level and delete test data."""
global_guard.level = RETRIEVE
- setup_module()
+ setup()
def test_assure_list_in_place():
"""Test an in-place update with `assure_object_is_in_list`."""
-
int_list_prop = db.Property(name="TestIntListProperty",
datatype=db.LIST(db.INTEGER)).insert()
rt1 = db.RecordType(name="TestType1").add_property(
diff --git a/src/caosadvancedtools/cfood.py b/src/caosadvancedtools/cfood.py
index 2c56e171..3c2d5408 100644
--- a/src/caosadvancedtools/cfood.py
+++ b/src/caosadvancedtools/cfood.py
@@ -391,7 +391,7 @@ class AbstractFileCFood(AbstractCFood):
def assure_object_is_in_list(obj, containing_object, property_name,
to_be_updated=None, datatype=None):
"""Checks whether `obj` is one of the values in the list property
- `property_name` of the supplied entity containing_object`.
+ `property_name` of the supplied entity `containing_object`.
If this is the case this function returns. Otherwise the entity is
added to the property `property_name` and the entity
--
GitLab