Use underscore instead of dash in the file name for the test settings. Also fix the import of the settings module.
Signed-off-by: Michael Wood <[email protected]> --- bitbake/lib/toaster/tests/builds/README | 2 +- bitbake/lib/toaster/toastermain/settings-test.py | 41 ------------------------ bitbake/lib/toaster/toastermain/settings_test.py | 41 ++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 bitbake/lib/toaster/toastermain/settings-test.py create mode 100644 bitbake/lib/toaster/toastermain/settings_test.py diff --git a/bitbake/lib/toaster/tests/builds/README b/bitbake/lib/toaster/tests/builds/README index 98e3e2e..4a3b532 100644 --- a/bitbake/lib/toaster/tests/builds/README +++ b/bitbake/lib/toaster/tests/builds/README @@ -7,7 +7,7 @@ The simplest way to run the tests are the following commands: $ . oe-init-build-env $ cd bitbake/lib/toaster/ # path my vary but this is into toaster's directory -$ DJANGO_SETTINGS_MODULE='toastermain.settings-test' ./manage.py test tests.builds +$ DJANGO_SETTINGS_MODULE='toastermain.settings_test' ./manage.py test tests.builds Optional environment variables: - TOASTER_DIR (where toaster keeps it's artifacts) diff --git a/bitbake/lib/toaster/toastermain/settings-test.py b/bitbake/lib/toaster/toastermain/settings-test.py deleted file mode 100644 index 36b14c0..0000000 --- a/bitbake/lib/toaster/toastermain/settings-test.py +++ /dev/null @@ -1,41 +0,0 @@ -# -# ex:ts=4:sw=4:sts=4:et -# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- -# -# BitBake Toaster Implementation -# -# Copyright (C) 2016 Intel Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# Django settings for Toaster project. - -# Settings overlay to use for running tests -# DJANGO_SETTINGS_MODULE=toastermain.settings-test - -from settings import * - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': '/tmp/toaster-test-db.sqlite', - 'TEST': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': '/tmp/toaster-test-db.sqlite', - } - } -} diff --git a/bitbake/lib/toaster/toastermain/settings_test.py b/bitbake/lib/toaster/toastermain/settings_test.py new file mode 100644 index 0000000..a322711 --- /dev/null +++ b/bitbake/lib/toaster/toastermain/settings_test.py @@ -0,0 +1,41 @@ +# +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# BitBake Toaster Implementation +# +# Copyright (C) 2016 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Django settings for Toaster project. + +# Settings overlay to use for running tests +# DJANGO_SETTINGS_MODULE=toastermain.settings-test + +from toastermain.settings import * + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': '/tmp/toaster-test-db.sqlite', + 'TEST': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': '/tmp/toaster-test-db.sqlite', + } + } +} -- 2.7.4 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
