From 0c72197f7fb1eb81f32bac356ba860b7f1198071 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 20 Mar 2024 15:02:52 +0100
Subject: [PATCH] TST: fix tests
---
tests/test_data_model_leap.py | 4 +--
tests/test_datatype.py | 4 +--
tests/test_datatype_inheritance.py | 2 +-
tests/test_misc.py | 1 +
tests/test_server_side_scripting.py | 40 ++++++++++++++---------------
5 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/tests/test_data_model_leap.py b/tests/test_data_model_leap.py
index 1601975..43c8281 100644
--- a/tests/test_data_model_leap.py
+++ b/tests/test_data_model_leap.py
@@ -31,8 +31,8 @@ from nose.tools import assert_true, assert_equal, assert_is_not_none # @Unresol
def test_leap_datamodel():
import caosdb as h
try:
- h.execute_query("FIND ENTITY").delete()
- except BaseException:
+ h.execute_query("FIND ENTITY").delete(chunk_size=15)
+ except:
pass
try:
diff --git a/tests/test_datatype.py b/tests/test_datatype.py
index a536d50..c321af8 100644
--- a/tests/test_datatype.py
+++ b/tests/test_datatype.py
@@ -31,8 +31,8 @@ from pytest import raises
def setup_function(function):
try:
- db.execute_query("FIND ENTITY").delete()
- except BaseException:
+ db.execute_query("FIND ENTITY").delete(chunk_size=10)
+ except:
pass
diff --git a/tests/test_datatype_inheritance.py b/tests/test_datatype_inheritance.py
index 0608834..4f7005d 100644
--- a/tests/test_datatype_inheritance.py
+++ b/tests/test_datatype_inheritance.py
@@ -37,7 +37,7 @@ def setup_function(function):
def teardown_function(function):
try:
- db.execute_query("FIND ENTITY").delete()
+ db.execute_query("FIND ENTITY").delete(chunk_size=15)
except BaseException:
pass
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 8ffa143..4a7084c 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -40,6 +40,7 @@ def setup_function(function):
def teardown_function(function):
+ setup_function(function)
assert len(db.execute_query("FIND Entity")) == 0
diff --git a/tests/test_server_side_scripting.py b/tests/test_server_side_scripting.py
index c7d1078..a1aef79 100644
--- a/tests/test_server_side_scripting.py
+++ b/tests/test_server_side_scripting.py
@@ -33,13 +33,13 @@ import ssl
import tempfile
from http.client import HTTPSConnection
-from caosdb import Info, RecordType
-from caosdb import administration as admin
-from caosdb import execute_query, get_config, get_connection
-from caosdb.connection.encode import MultipartParam, multipart_encode
-from caosdb.connection.utils import urlencode, urlparse
-from caosdb.exceptions import HTTPClientError, HTTPResourceNotFoundError
-from caosdb.utils.server_side_scripting import run_server_side_script
+from linkahead import Info, RecordType
+from linkahead import administration as admin
+from linkahead import execute_query, get_config, get_connection
+from linkahead.connection.encode import MultipartParam, multipart_encode
+from linkahead.connection.utils import urlencode, urlparse
+from linkahead.exceptions import HTTPClientError, HTTPResourceNotFoundError
+from linkahead.utils.server_side_scripting import run_server_side_script
from lxml import etree
from pytest import mark, raises
@@ -207,9 +207,9 @@ def test_run_server_side_script_with_file_as_positional_param():
'pos0 pos1 .upload_files/test_file.txt')
json_data = json.loads(response.stdout)
- assert "caosdb" in json_data
- assert "query" in json_data["caosdb"]
- assert json_data["caosdb"]["query"] == ["COUNT ENTITY TestRT", "1"]
+ assert "linkahead" in json_data
+ assert "query" in json_data["linkahead"]
+ assert json_data["linkahead"]["query"] == ["COUNT ENTITY TestRT", "1"]
assert "./.upload_files/test_file.txt" in json_data["files"]
@@ -232,7 +232,7 @@ def test_run_server_side_script_with_additional_file():
'pos0 pos1')
json_data = json.loads(response.stdout)
- assert json_data["caosdb"]["query"] == ["COUNT ENTITY TestRT", "1"]
+ assert json_data["linkahead"]["query"] == ["COUNT ENTITY TestRT", "1"]
assert "./.upload_files/test_file.txt" in json_data["files"]
@@ -256,16 +256,16 @@ def test_diagnostics_basic():
assert diagnostics is not None
diagnostics = json.loads(diagnostics)
assert diagnostics["python_version"] is not None
- assert diagnostics["import"]["caosdb"][0] is True, ("caosdb not installed"
+ assert diagnostics["import"]["linkahead"][0] is True, ("linkahead not installed"
" in server's python path")
assert diagnostics["auth_token"] is not None
EXC_ERR = ("There shouldn't be any exception during the diagnostics of "
"the interaction of the server-side script and the server.")
- assert "exception" not in diagnostics["caosdb"], EXC_ERR
+ assert "exception" not in diagnostics["linkahead"], EXC_ERR
- assert "query" in diagnostics["caosdb"]
- assert diagnostics["caosdb"]["query"][0] == "COUNT ENTITY TestRT"
- assert diagnostics["caosdb"]["query"][1] == "1", ("The RecordType should "
+ assert "query" in diagnostics["linkahead"]
+ assert diagnostics["linkahead"]["query"][0] == "COUNT ENTITY TestRT"
+ assert diagnostics["linkahead"]["query"][1] == "1", ("The RecordType should "
"have been found.")
assert xml.xpath("/Response/script/@code")[0] == "123", ("The script "
"should exit "
@@ -300,10 +300,10 @@ def test_diagnostics_with_file_upload():
assert diagnostics is not None
diagnostics = json.loads(diagnostics)
assert diagnostics["python_version"] is not None
- assert diagnostics["import"]["caosdb"][0] is True, ("caosdb not installed"
+ assert diagnostics["import"]["linkahead"][0] is True, ("linkahead not installed"
" in server's python path")
assert diagnostics["auth_token"] is not None
- assert "exception" not in diagnostics["caosdb"], ("There shouldn't be any "
+ assert "exception" not in diagnostics["linkahead"], ("There shouldn't be any "
"exception during the "
"diagnostics of the "
"interaction of the "
@@ -349,10 +349,10 @@ def test_call_as_anonymous_with_administration_role():
assert diagnostics is not None
diagnostics = json.loads(diagnostics)
assert diagnostics["python_version"] is not None
- assert diagnostics["import"]["caosdb"][0] is True, ("caosdb not installed"
+ assert diagnostics["import"]["linkahead"][0] is True, ("linkahead not installed"
" in server's python path")
assert diagnostics["auth_token"] is not None
- assert "exception" not in diagnostics["caosdb"]
+ assert "exception" not in diagnostics["linkahead"]
def request(method, headers, path, body=None):
--
GitLab