summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-06-13 14:29:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-14 11:08:59 +0100
commit0bdfcafdd1e2ebc10dc0cd343c8bb77f09a71c90 (patch)
tree0609e66739017d7a9cb6a1937b3cbc132ffd067a
parentfccc8869dc465b49f236c15a9aa14b7d06694b8e (diff)
downloadbitbake-contrib-0bdfcafdd1e2ebc10dc0cd343c8bb77f09a71c90.tar.gz
toaster: tests Rename test settings to python compliant name and fix import
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 <michael.g.wood@intel.com>
-rw-r--r--lib/toaster/tests/builds/README2
-rw-r--r--lib/toaster/toastermain/settings_test.py (renamed from lib/toaster/toastermain/settings-test.py)2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/toaster/tests/builds/README b/lib/toaster/tests/builds/README
index 98e3e2e04..4a3b5328b 100644
--- a/lib/toaster/tests/builds/README
+++ b/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/lib/toaster/toastermain/settings-test.py b/lib/toaster/toastermain/settings_test.py
index 36b14c06d..a32271157 100644
--- a/lib/toaster/toastermain/settings-test.py
+++ b/lib/toaster/toastermain/settings_test.py
@@ -24,7 +24,7 @@
# Settings overlay to use for running tests
# DJANGO_SETTINGS_MODULE=toastermain.settings-test
-from settings import *
+from toastermain.settings import *
DEBUG = True
TEMPLATE_DEBUG = DEBUG