[System] Allow setting a test configuration for unit tests.
This commit is contained in:
parent
fe7166686d
commit
94aac573e6
|
@ -71,7 +71,7 @@ def install_all():
|
|||
roleController.create_permissions(plugin.permissions)
|
||||
|
||||
|
||||
def create_app():
|
||||
def create_app(test_config=None):
|
||||
app = Flask(__name__)
|
||||
app.json_encoder = CustomJSONEncoder
|
||||
CORS(app)
|
||||
|
@ -79,7 +79,7 @@ def create_app():
|
|||
with app.app_context():
|
||||
from flaschengeist.database import db
|
||||
|
||||
configure_app(app)
|
||||
configure_app(app, test_config)
|
||||
db.init_app(app)
|
||||
__load_plugins(app)
|
||||
|
||||
|
|
|
@ -8,33 +8,44 @@ from werkzeug.middleware.proxy_fix import ProxyFix
|
|||
from flaschengeist import _module_path, logger
|
||||
|
||||
|
||||
def __update(d, u):
|
||||
# Default config:
|
||||
config = {}
|
||||
|
||||
|
||||
def update_dict(d, u):
|
||||
for k, v in u.items():
|
||||
if isinstance(v, collections.abc.Mapping):
|
||||
d[k] = __update(d.get(k, {}), v)
|
||||
d[k] = update_dict(d.get(k, {}), v)
|
||||
else:
|
||||
d[k] = v
|
||||
return d
|
||||
|
||||
|
||||
# Default config:
|
||||
config = {}
|
||||
def read_configuration():
|
||||
global config
|
||||
|
||||
__paths = [_module_path, Path.home() / ".config"]
|
||||
if "FLASCHENGEIST_CONF" in os.environ:
|
||||
__paths.append(Path(os.environ.get("FLASCHENGEIST_CONF")))
|
||||
for loc in __paths:
|
||||
try:
|
||||
with (loc / "flaschengeist.toml").open() as source:
|
||||
logger.info("Reading config file from >{}<".format(loc))
|
||||
__update(config, toml.load(source))
|
||||
except IOError:
|
||||
pass
|
||||
# Always enable this builtin plugins!
|
||||
__update(config, {"auth": {"enabled": True}, "roles": {"enabled": True}, "users": {"enabled": True}})
|
||||
paths = [_module_path, Path.home() / ".config"]
|
||||
if "FLASCHENGEIST_CONF" in os.environ:
|
||||
paths.append(Path(os.environ.get("FLASCHENGEIST_CONF")))
|
||||
|
||||
for loc in paths:
|
||||
try:
|
||||
with (loc / "flaschengeist.toml").open() as source:
|
||||
print("Reading config file from >{}<".format(loc))
|
||||
update_dict(config, toml.load(source))
|
||||
except IOError:
|
||||
pass
|
||||
|
||||
|
||||
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")
|
||||
if "LOGGING" in config:
|
||||
if "level" in config["LOGGING"]:
|
||||
|
@ -52,12 +63,15 @@ def configure_app(app):
|
|||
else:
|
||||
app.config["SECRET_KEY"] = config["FLASCHENGEIST"]["secret_key"]
|
||||
|
||||
app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://{user}:{passwd}@{host}/{database}".format(
|
||||
user=config["DATABASE"]["user"],
|
||||
passwd=config["DATABASE"]["password"],
|
||||
host=config["DATABASE"]["host"],
|
||||
database=config["DATABASE"]["database"],
|
||||
)
|
||||
if test_config is None:
|
||||
app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://{user}:{passwd}@{host}/{database}".format(
|
||||
user=config["DATABASE"]["user"],
|
||||
passwd=config["DATABASE"]["password"],
|
||||
host=config["DATABASE"]["host"],
|
||||
database=config["DATABASE"]["database"],
|
||||
)
|
||||
else:
|
||||
app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite+pysqlite://{config['DATABASE']['file_path']}"
|
||||
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
|
||||
|
||||
if "root" in config["FLASCHENGEIST"]:
|
||||
|
|
Loading…
Reference in New Issue