Skip to content
Snippets Groups Projects
Commit e55feb36 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

FIX: some integration tests (due to login)

parent 8ec35412
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ test_files.test_insert_files_in_dir.server=/opt/caosdb/mnt/extroot/test_insert_f ...@@ -18,7 +18,7 @@ test_files.test_insert_files_in_dir.server=/opt/caosdb/mnt/extroot/test_insert_f
#cacert=/etc/ssl/cert.pem #cacert=/etc/ssl/cert.pem
#debug=0 #debug=0
#passwordmethod=plain #password_method=plain
#password=caosdb #password=caosdb
#ssl_insecure=True #ssl_insecure=True
......
...@@ -26,11 +26,13 @@ ...@@ -26,11 +26,13 @@
@author: tf @author: tf
""" """
from caosdb import (administration as admin, get_config) from caosdb import administration as admin
from nose.tools import assert_true, assert_equal, assert_is_not_none, assert_raises from caosdb import get_config
from caosdb.exceptions import (ClientErrorException, TransactionError, from caosdb.connection.connection import configure_connection, get_connection
AuthorizationException, LoginFailedException) from caosdb.exceptions import (AuthorizationException, ClientErrorException,
from caosdb.connection.connection import get_connection, configure_connection LoginFailedException, TransactionError)
from nose.tools import (assert_equal, assert_is_not_none, assert_raises,
assert_true)
test_role = "test_role" test_role = "test_role"
test_user = "test_user" test_user = "test_user"
...@@ -246,6 +248,7 @@ def test_get_roles_success(): ...@@ -246,6 +248,7 @@ def test_get_roles_success():
test_insert_role_success() test_insert_role_success()
r = admin._get_roles(username=test_user) r = admin._get_roles(username=test_user)
assert_is_not_none(r) assert_is_not_none(r)
return r return r
...@@ -571,6 +574,7 @@ def test_login_with_inactive_user_failure(): ...@@ -571,6 +574,7 @@ def test_login_with_inactive_user_failure():
status="INACTIVE", status="INACTIVE",
email="email@example.com", email="email@example.com",
entity=None)) 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): with assert_raises(LoginFailedException):
get_connection()._login() get_connection()._login()
...@@ -26,10 +26,13 @@ ...@@ -26,10 +26,13 @@
@author: tf @author: tf
""" """
import caosdb as db 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(): def setup_module():
db.configure_connection()
try: try:
db.administration._delete_user(name="test_user") db.administration._delete_user(name="test_user")
except Exception as e: except Exception as e:
...@@ -81,13 +84,7 @@ def setup(): ...@@ -81,13 +84,7 @@ def setup():
def teardown(): def teardown():
try: db.configure_connection()
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)
try: try:
db.execute_query("FIND QUERYTEMPLATE Test*").delete() db.execute_query("FIND QUERYTEMPLATE Test*").delete()
except Exception as e: except Exception as e:
......
...@@ -25,10 +25,7 @@ import caosdb as db ...@@ -25,10 +25,7 @@ import caosdb as db
import pytest import pytest
from caosdb import execute_query as query from caosdb import execute_query as query
db.configure_connection(username="admin", password="caosdb", db.configure_connection()
password_method="plain")
CONTAINER = db.Container() CONTAINER = db.Container()
NAME_PROPERTY = db.Property("name").retrieve() NAME_PROPERTY = db.Property("name").retrieve()
TEST_PROP_TEXT = db.Property("TestPropertyText", datatype=db.TEXT) TEST_PROP_TEXT = db.Property("TestPropertyText", datatype=db.TEXT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment