Skip to content
Snippets Groups Projects
Commit 99398720 authored by Jan Mach's avatar Jan Mach
Browse files

Initial work to make unit tests, well, work.

(Redmine issue: #7494)
parent 711539b4
No related branches found
No related tags found
No related merge requests found
include LICENSE.txt include LICENSE.txt
include README.rst include README.rst
include lib/hawat/babel.cfg
include lib/hawat/Makefile* include lib/hawat/Makefile*
recursive-include lib/mentat/templates_email * recursive-include lib/mentat/templates_email *
recursive-include lib/hawat/static * recursive-include lib/hawat/static *
......
...@@ -34,3 +34,4 @@ typedcols==0.1.13 ...@@ -34,3 +34,4 @@ typedcols==0.1.13
idea-format==0.1.11 idea-format==0.1.11
python-dateutil==2.8.1 python-dateutil==2.8.1
PyBabel-json-md==0.1.0 PyBabel-json-md==0.1.0
itsdangerous==2.0.1
...@@ -40,6 +40,7 @@ def _config_testapp_hawat(app_config): ...@@ -40,6 +40,7 @@ def _config_testapp_hawat(app_config):
app_config['MAIL_PORT'] = 1025 app_config['MAIL_PORT'] = 1025
app_config['MAIL_DEFAULT_SENDER'] = 'root@unittest' app_config['MAIL_DEFAULT_SENDER'] = 'root@unittest'
app_config['EMAIL_ADMINS'] = ['admin@unittest'] app_config['EMAIL_ADMINS'] = ['admin@unittest']
app_config['DISABLE_MAIL_LOGGING'] = True
app_config['MODELS'] = { app_config['MODELS'] = {
vial.const.MODEL_USER: UserModel, vial.const.MODEL_USER: UserModel,
vial.const.MODEL_GROUP: GroupModel, vial.const.MODEL_GROUP: GroupModel,
......
...@@ -60,6 +60,8 @@ class Config: # pylint: disable=locally-disabled,too-few-public-methods ...@@ -60,6 +60,8 @@ class Config: # pylint: disable=locally-disabled,too-few-public-methods
MAIL_DEFAULT_SENDER = '{}@{}'.format(APPLICATION_ID, socket.getfqdn()) MAIL_DEFAULT_SENDER = '{}@{}'.format(APPLICATION_ID, socket.getfqdn())
MAIL_SUBJECT_PREFIX = '[{}]'.format(APPLICATION_NAME) MAIL_SUBJECT_PREFIX = '[{}]'.format(APPLICATION_NAME)
DISABLE_MAIL_LOGGING = False
# #
# Flask-Babel configurations. # Flask-Babel configurations.
# #
......
...@@ -76,6 +76,9 @@ def setup_logging_email(app): ...@@ -76,6 +76,9 @@ def setup_logging_email(app):
""" """
Setup application logging via email. Setup application logging via email.
""" """
if app.config['DISABLE_MAIL_LOGGING']:
return app
log_level_str = app.config['LOG_EMAIL_LEVEL'].upper() log_level_str = app.config['LOG_EMAIL_LEVEL'].upper()
log_level = getattr( log_level = getattr(
logging, logging,
......
...@@ -36,6 +36,7 @@ def _config_testapp_vial(app_config): ...@@ -36,6 +36,7 @@ def _config_testapp_vial(app_config):
app_config['MAIL_PORT'] = 1025 app_config['MAIL_PORT'] = 1025
app_config['MAIL_DEFAULT_SENDER'] = 'root@unittest' app_config['MAIL_DEFAULT_SENDER'] = 'root@unittest'
app_config['EMAIL_ADMINS'] = ['admin@unittest'] app_config['EMAIL_ADMINS'] = ['admin@unittest']
app_config['DISABLE_MAIL_LOGGING'] = True
app_config['MODELS'] = { app_config['MODELS'] = {
vial.const.MODEL_USER: vial.model.db.UserModel, vial.const.MODEL_USER: vial.model.db.UserModel,
vial.const.MODEL_GROUP: vial.model.db.GroupModel, vial.const.MODEL_GROUP: vial.model.db.GroupModel,
......
...@@ -133,4 +133,9 @@ if [ ! -L /etc/apache2/sites-enabled/site_mentat_vagrant.conf ] ; then ...@@ -133,4 +133,9 @@ if [ ! -L /etc/apache2/sites-enabled/site_mentat_vagrant.conf ] ; then
systemctl restart apache2.service systemctl restart apache2.service
fi fi
print_subtitle 'Creating stubs for unit tests'
mkdir -p /vagrant/chroot
ln -s /etc /vagrant/chroot/etc
ln -s /var /vagrant/chroot/var
print_title '<DONE> PROVISIONING MENTAT SYSTEM' print_title '<DONE> PROVISIONING MENTAT SYSTEM'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment