From 388dffd33d53bf935a635fda1af3afa698d0496e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 11 Nov 2022 14:50:16 +0100
Subject: [PATCH] Fix tests for FIND *
---
tests/test_boolean.py | 2 +-
tests/test_datatype.py | 2 +-
tests/test_datatype_inheritance.py | 2 +-
tests/test_datetime.py | 2 +-
tests/test_double.py | 2 +-
tests/test_empty_text_value.py | 2 +-
tests/test_error_stuff.py | 2 +-
tests/test_importance.py | 2 +-
tests/test_permissions.py | 4 ++--
tests/test_query.py | 4 ++--
tests/test_query_template.py | 2 +-
tests/test_tickets.py | 2 +-
tests/test_tickets_200.py | 2 +-
tests/test_unit.py | 2 +-
14 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests/test_boolean.py b/tests/test_boolean.py
index 05533c1..ef8f317 100644
--- a/tests/test_boolean.py
+++ b/tests/test_boolean.py
@@ -33,7 +33,7 @@ from pytest import raises
def teardown_module():
try:
- h.execute_query("FIND *").delete()
+ h.execute_query("FIND ENTITY").delete()
except BaseException:
pass
diff --git a/tests/test_datatype.py b/tests/test_datatype.py
index 9c015ab..a536d50 100644
--- a/tests/test_datatype.py
+++ b/tests/test_datatype.py
@@ -31,7 +31,7 @@ from pytest import raises
def setup_function(function):
try:
- db.execute_query("FIND *").delete()
+ db.execute_query("FIND ENTITY").delete()
except BaseException:
pass
diff --git a/tests/test_datatype_inheritance.py b/tests/test_datatype_inheritance.py
index 8e22b3e..4ab7311 100644
--- a/tests/test_datatype_inheritance.py
+++ b/tests/test_datatype_inheritance.py
@@ -36,7 +36,7 @@ def setup_function(function):
def teardown_function(function):
try:
- db.execute_query("FIND *").delete()
+ db.execute_query("FIND ENTITY").delete()
except BaseException:
pass
diff --git a/tests/test_datetime.py b/tests/test_datetime.py
index 4227a94..3925370 100644
--- a/tests/test_datetime.py
+++ b/tests/test_datetime.py
@@ -35,7 +35,7 @@ old_stored = None
def setup_function(function):
try:
- h.execute_query("FIND *").delete()
+ h.execute_query("FIND ENTITY").delete()
except BaseException:
pass
diff --git a/tests/test_double.py b/tests/test_double.py
index f710a62..f01f85e 100644
--- a/tests/test_double.py
+++ b/tests/test_double.py
@@ -26,7 +26,7 @@ import caosdb as db
def setup_module():
- clean = db.execute_query("FIND *")
+ clean = db.execute_query("FIND ENTITY")
if len(clean) > 0:
clean.delete()
diff --git a/tests/test_empty_text_value.py b/tests/test_empty_text_value.py
index dc4f5cb..dba100e 100644
--- a/tests/test_empty_text_value.py
+++ b/tests/test_empty_text_value.py
@@ -34,7 +34,7 @@ def setup_function(function):
def teardown_function(function):
try:
- db.execute_query("FIND *").delete()
+ db.execute_query("FIND ENTITY").delete()
except Exception as e:
print(e)
diff --git a/tests/test_error_stuff.py b/tests/test_error_stuff.py
index 2d905be..b43b53e 100644
--- a/tests/test_error_stuff.py
+++ b/tests/test_error_stuff.py
@@ -42,7 +42,7 @@ import pytest
def setup_function(function):
try:
- h.execute_query("FIND *").delete()
+ h.execute_query("FIND ENTITY").delete()
except BaseException:
pass
diff --git a/tests/test_importance.py b/tests/test_importance.py
index 709af3d..41668d9 100644
--- a/tests/test_importance.py
+++ b/tests/test_importance.py
@@ -27,7 +27,7 @@ def setup_function(function):
def teardown_module():
- clean = db.execute_query("FIND *")
+ clean = db.execute_query("FIND ENTITY")
if len(clean) > 0:
clean.delete()
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index 7a6c95c..a88735d 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -42,7 +42,7 @@ test_pw = "passphrase1P!"
def setup_module():
- d = db.execute_query("FIND *")
+ d = db.execute_query("FIND ENTITY")
if len(d) > 0:
d.delete()
insert_test_user()
@@ -61,7 +61,7 @@ def teardown_module():
os.remove("test2.dat")
except BaseException:
pass
- d = db.execute_query("FIND *")
+ d = db.execute_query("FIND ENTITY")
if len(d) > 0:
d.delete()
diff --git a/tests/test_query.py b/tests/test_query.py
index a7f11fa..33e8220 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -46,7 +46,7 @@ def setup_module():
def setup_function(function):
db.administration.set_server_property("FIND_QUERY_DEFAULT_ROLE", "ENTITY")
try:
- db.execute_query("FIND *").delete()
+ db.execute_query("FIND ENTITY").delete()
except Exception as e:
print(e)
@@ -1163,7 +1163,7 @@ def test_query_cache_with_permissions():
def test_find_star():
"""related: caosdb-server#116"""
rt = db.RecordType("TestRT").insert()
- response = db.execute_query("FIND *")[0]
+ response = db.execute_query("FIND ENTITY")[0]
assert response.id == rt.id
diff --git a/tests/test_query_template.py b/tests/test_query_template.py
index 7da1e72..f9c0699 100644
--- a/tests/test_query_template.py
+++ b/tests/test_query_template.py
@@ -37,7 +37,7 @@ def setup_module():
except Exception as e:
print(e)
try:
- db.execute_query("FIND *").delete()
+ db.execute_query("FIND ENTITY").delete()
except Exception as e:
print(e)
db.RecordType(name="TestPerson").insert()
diff --git a/tests/test_tickets.py b/tests/test_tickets.py
index 728edb5..106d2f6 100644
--- a/tests/test_tickets.py
+++ b/tests/test_tickets.py
@@ -33,7 +33,7 @@ from tests import test_misc
def setup_function(function):
- d = db.execute_query("FIND *")
+ d = db.execute_query("FIND ENTITY")
if len(d) > 0:
d.delete()
diff --git a/tests/test_tickets_200.py b/tests/test_tickets_200.py
index d7647de..b6af11a 100644
--- a/tests/test_tickets_200.py
+++ b/tests/test_tickets_200.py
@@ -37,7 +37,7 @@ def setup_function(function):
def setup_module():
try:
- h.execute_query("FIND *").delete()
+ h.execute_query("FIND ENTITY").delete()
except Exception as e:
print(e)
diff --git a/tests/test_unit.py b/tests/test_unit.py
index 20ef055..fb2a403 100644
--- a/tests/test_unit.py
+++ b/tests/test_unit.py
@@ -31,7 +31,7 @@ import caosdb as h
def setup_module():
try:
- h.execute_query("FIND *").delete()
+ h.execute_query("FIND ENTITY").delete()
except BaseException:
pass
--
GitLab