From 8285989ef70c7162d3ffb27656ffd7559733543e Mon Sep 17 00:00:00 2001 From: Gael Pasgrimaud Date: Fri, 16 Sep 2016 14:22:19 +0200 Subject: [PATCH] add --extra-fixtures options to avoid python code in tox.ini --- modoboa/core/management/commands/load_initial_data.py | 8 ++++++++ tox.ini | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modoboa/core/management/commands/load_initial_data.py b/modoboa/core/management/commands/load_initial_data.py index 093343324..bdda736c3 100644 --- a/modoboa/core/management/commands/load_initial_data.py +++ b/modoboa/core/management/commands/load_initial_data.py @@ -30,6 +30,10 @@ class Command(BaseCommand): "--admin-username", default="admin", help="Username of the initial super administrator." ) + parser.add_argument( + "--extra-fixtures", action="store_true", default=False, + help="Also load some fixtures from the admin application." + ) def handle(self, *args, **options): """Command entry point.""" @@ -70,3 +74,7 @@ class Command(BaseCommand): extension = exts_pool.get_extension(extname) extension.load_initial_data() events.raiseEvent("InitialDataLoaded", extname) + + if options['extra_fixtures']: + from modoboa.admin import factories + factories.populate_database() diff --git a/tox.ini b/tox.ini index 4116e7f52..0e19beca8 100644 --- a/tox.ini +++ b/tox.ini @@ -14,10 +14,12 @@ setenv = [testenv:serve] changedir=test_project +whitelist_externals = + rm commands = + rm -f modoboa_test.db python manage.py migrate --no-input - python manage.py load_initial_data - python -c "import django; django.setup(); from modoboa.admin.factories import populate_database; populate_database()" + python manage.py load_initial_data --extra-fixtures python manage.py runserver setenv = DJANGO_SETTINGS_MODULE=test_project.settings