Skip to content
Snippets Groups Projects

TST: refactor configuration test

Merged Henrik tom Wörden requested to merge f-read-config-files into dev
4 files
+ 57
15
Compare changes
  • Side-by-side
  • Inline
Files
4
+ 4
10
@@ -37,7 +37,7 @@ from os.path import expanduser, join
@@ -37,7 +37,7 @@ from os.path import expanduser, join
import caosdb.apiutils
import caosdb.apiutils
from caosdb.common import administration
from caosdb.common import administration
from caosdb.common.datatype import (BOOLEAN, DATETIME, DOUBLE, FILE, INTEGER,
from caosdb.common.datatype import (BOOLEAN, DATETIME, DOUBLE, FILE, INTEGER,
REFERENCE, TEXT, LIST)
LIST, REFERENCE, TEXT)
# Import of the basic API classes:
# Import of the basic API classes:
from caosdb.common.models import (ACL, ALL, FIX, NONE, OBLIGATORY, RECOMMENDED,
from caosdb.common.models import (ACL, ALL, FIX, NONE, OBLIGATORY, RECOMMENDED,
SUGGESTED, Container, DropOffBox, Entity,
SUGGESTED, Container, DropOffBox, Entity,
@@ -45,15 +45,9 @@ from caosdb.common.models import (ACL, ALL, FIX, NONE, OBLIGATORY, RECOMMENDED,
@@ -45,15 +45,9 @@ from caosdb.common.models import (ACL, ALL, FIX, NONE, OBLIGATORY, RECOMMENDED,
Query, QueryTemplate, Record, RecordType,
Query, QueryTemplate, Record, RecordType,
delete, execute_query, get_global_acl,
delete, execute_query, get_global_acl,
get_known_permissions, raise_errors)
get_known_permissions, raise_errors)
from caosdb.configuration import configure, get_config
from caosdb.configuration import _read_config_files, configure, get_config
from caosdb.connection.connection import configure_connection, get_connection
from caosdb.connection.connection import configure_connection, get_connection
from caosdb.version import version as __version__
from caosdb.exceptions import *
from caosdb.exceptions import *
 
from caosdb.version import version as __version__
# read configuration these files
_read_config_files()
if "PYCAOSDBINI" in environ:
configure(expanduser(environ["PYCAOSDBINI"]))
else:
configure(expanduser('~/.pycaosdb.ini'))
configure(join(getcwd(), "pycaosdb.ini"))
Loading