Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

[System] Allow setting a test configuration for unit tests.

This commit is contained in:
Ferdinand Thiessen 2021-01-23 02:12:42 +01:00
parent fe7166686d
commit 94aac573e6
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flaschengeist/app.py
View File

@ -71,7 +71,7 @@ def install_all():
roleController.create_permissions(plugin.permissions) roleController.create_permissions(plugin.permissions)
def create_app(): def create_app(test_config=None):
app = Flask(__name__) app = Flask(__name__)
app.json_encoder = CustomJSONEncoder app.json_encoder = CustomJSONEncoder
CORS(app) CORS(app)
@ -79,7 +79,7 @@ def create_app():
with app.app_context(): with app.app_context():
from flaschengeist.database import db from flaschengeist.database import db
configure_app(app) configure_app(app, test_config)
db.init_app(app) db.init_app(app)
__load_plugins(app) __load_plugins(app)

40
flaschengeist/config.py
View File

@ -8,33 +8,44 @@ from werkzeug.middleware.proxy_fix import ProxyFix
from flaschengeist import _module_path, logger from flaschengeist import _module_path, logger
def __update(d, u): # Default config:
config = {}
def update_dict(d, u):
for k, v in u.items(): for k, v in u.items():
if isinstance(v, collections.abc.Mapping): if isinstance(v, collections.abc.Mapping):
d[k] = __update(d.get(k, {}), v) d[k] = update_dict(d.get(k, {}), v)
else: else:
d[k] = v d[k] = v
return d return d
# Default config: def read_configuration():
config = {} global config
__paths = [_module_path, Path.home() / ".config"] paths = [_module_path, Path.home() / ".config"]
if "FLASCHENGEIST_CONF" in os.environ: if "FLASCHENGEIST_CONF" in os.environ:
__paths.append(Path(os.environ.get("FLASCHENGEIST_CONF"))) paths.append(Path(os.environ.get("FLASCHENGEIST_CONF")))
for loc in __paths:
for loc in paths:
try: try:
with (loc / "flaschengeist.toml").open() as source: with (loc / "flaschengeist.toml").open() as source:
logger.info("Reading config file from >{}<".format(loc)) print("Reading config file from >{}<".format(loc))
__update(config, toml.load(source)) update_dict(config, toml.load(source))
except IOError: except IOError:
pass pass
# Always enable this builtin plugins!
__update(config, {"auth": {"enabled": True}, "roles": {"enabled": True}, "users": {"enabled": True}})
def configure_app(app): def configure_app(app, test_config=None):
global config
if test_config is None:
read_configuration()
else:
update_dict(config, test_config)
# Always enable this builtin plugins!
update_dict(config, {"auth": {"enabled": True}, "roles": {"enabled": True}, "users": {"enabled": True}})
logger_config = toml.load(_module_path / "logging.toml") logger_config = toml.load(_module_path / "logging.toml")
if "LOGGING" in config: if "LOGGING" in config:
if "level" in config["LOGGING"]: if "level" in config["LOGGING"]:
@ -52,12 +63,15 @@ def configure_app(app):
else: else:
app.config["SECRET_KEY"] = config["FLASCHENGEIST"]["secret_key"] app.config["SECRET_KEY"] = config["FLASCHENGEIST"]["secret_key"]
if test_config is None:
app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://{user}:{passwd}@{host}/{database}".format( app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://{user}:{passwd}@{host}/{database}".format(
user=config["DATABASE"]["user"], user=config["DATABASE"]["user"],
passwd=config["DATABASE"]["password"], passwd=config["DATABASE"]["password"],
host=config["DATABASE"]["host"], host=config["DATABASE"]["host"],
database=config["DATABASE"]["database"], database=config["DATABASE"]["database"],
) )
else:
app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite+pysqlite://{config['DATABASE']['file_path']}"
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
if "root" in config["FLASCHENGEIST"]: if "root" in config["FLASCHENGEIST"]: