Always load base config in tests

Author: bnaul

cesium_app/tests/conftest.py

@@ -23,8 +23,8 @@
 
 
 print('Loading test configuration from _test_config.yaml')
-basedir = pathlib.Path(os.path.dirname(__file__))
-cfg = Config([(basedir/'../../_test_config.yaml').absolute()])
+basedir = pathlib.Path(os.path.dirname(__file__))/'../..'
+cfg = Config([basedir/'config.yaml.example', basedir/'_test_config.yaml'])
 set_server_url(cfg['server:url'])
 print('Setting test database to:', cfg['database'])
 models.init_db(**cfg['database'])

tools/test_frontend.py

@@ -68,8 +68,7 @@ def delete_test_yaml():
     from cesium_app.models import init_db
     from cesium_app.app_server import load_config
     basedir = pathlib.Path(os.path.dirname(__file__))/'..'
-    cfg = load_config([basedir/'config.yaml.example',
-                       basedir/TEST_CONFIG])
+    cfg = load_config([basedir/'config.yaml.example', basedir/TEST_CONFIG])
     init_db(**cfg['database'])
 
     clear_tables()