From e55feb3669b74aad51e6f5e53dd94c0874604773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 17 Dec 2020 14:36:53 +0100
Subject: [PATCH] FIX: some integration tests (due to login)
---
pycaosdb.ini.template | 2 +-
tests/test_administration.py | 16 ++++++++++------
tests/test_query_template.py | 13 +++++--------
tests/test_query_version.py | 5 +----
4 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/pycaosdb.ini.template b/pycaosdb.ini.template
index 38cfb5b..d8441a3 100644
--- a/pycaosdb.ini.template
+++ b/pycaosdb.ini.template
@@ -18,7 +18,7 @@ test_files.test_insert_files_in_dir.server=/opt/caosdb/mnt/extroot/test_insert_f
#cacert=/etc/ssl/cert.pem
#debug=0
-#passwordmethod=plain
+#password_method=plain
#password=caosdb
#ssl_insecure=True
diff --git a/tests/test_administration.py b/tests/test_administration.py
index 768214e..9ca57c6 100644
--- a/tests/test_administration.py
+++ b/tests/test_administration.py
@@ -26,11 +26,13 @@
@author: tf
"""
-from caosdb import (administration as admin, get_config)
-from nose.tools import assert_true, assert_equal, assert_is_not_none, assert_raises
-from caosdb.exceptions import (ClientErrorException, TransactionError,
- AuthorizationException, LoginFailedException)
-from caosdb.connection.connection import get_connection, configure_connection
+from caosdb import administration as admin
+from caosdb import get_config
+from caosdb.connection.connection import configure_connection, get_connection
+from caosdb.exceptions import (AuthorizationException, ClientErrorException,
+ LoginFailedException, TransactionError)
+from nose.tools import (assert_equal, assert_is_not_none, assert_raises,
+ assert_true)
test_role = "test_role"
test_user = "test_user"
@@ -246,6 +248,7 @@ def test_get_roles_success():
test_insert_role_success()
r = admin._get_roles(username=test_user)
assert_is_not_none(r)
+
return r
@@ -571,6 +574,7 @@ def test_login_with_inactive_user_failure():
status="INACTIVE",
email="email@example.com",
entity=None))
- configure_connection(username=test_user + "2", password="secret1P!")
+ configure_connection(username=test_user + "2", password="secret1P!",
+ password_method="plain")
with assert_raises(LoginFailedException):
get_connection()._login()
diff --git a/tests/test_query_template.py b/tests/test_query_template.py
index da3bdb4..be6bf40 100644
--- a/tests/test_query_template.py
+++ b/tests/test_query_template.py
@@ -26,10 +26,13 @@
@author: tf
"""
import caosdb as db
-from nose.tools import with_setup, assert_true, assert_is_none, assert_equal, assert_is_not_none, nottest, assert_raises # @UnresolvedImport
+from nose.tools import (assert_equal, assert_is_none, # @UnresolvedImport
+ assert_is_not_none, assert_raises, assert_true,
+ nottest, with_setup)
def setup_module():
+ db.configure_connection()
try:
db.administration._delete_user(name="test_user")
except Exception as e:
@@ -81,13 +84,7 @@ def setup():
def teardown():
- try:
- db.get_connection()._logout()
- db.configure_connection(username="test_user", password="secret_1q!Q",
- password_method="plain")
- db.get_connection()._login()
- except Exception as e:
- print(e)
+ db.configure_connection()
try:
db.execute_query("FIND QUERYTEMPLATE Test*").delete()
except Exception as e:
diff --git a/tests/test_query_version.py b/tests/test_query_version.py
index 061cd96..0b152ee 100644
--- a/tests/test_query_version.py
+++ b/tests/test_query_version.py
@@ -25,10 +25,7 @@ import caosdb as db
import pytest
from caosdb import execute_query as query
-db.configure_connection(username="admin", password="caosdb",
- password_method="plain")
-
-
+db.configure_connection()
CONTAINER = db.Container()
NAME_PROPERTY = db.Property("name").retrieve()
TEST_PROP_TEXT = db.Property("TestPropertyText", datatype=db.TEXT)
--
GitLab