From fade35f1bb0e9a9b19dedbc9c2c28caca7839131 Mon Sep 17 00:00:00 2001 From: Doug Fish Date: Thu, 1 Oct 2015 14:24:12 +0000 Subject: [PATCH] Make sure django env var is set Unit tests for the first patch are failing because DJANGO_SETTINGS_MODULE is not set. Add the pieces to do this. Change-Id: I9aff77126acf7c2e2d59966dd825f105e809edee Partially-Implements: blueprint horizon-lbaas-v2-ui --- manage.py | 23 +++++++++++++++++++++++ test-requirements.txt | 1 + tox.ini | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 manage.py diff --git a/manage.py b/manage.py new file mode 100644 index 00000000..5818a6de --- /dev/null +++ b/manage.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import os +import sys + +from django.core.management import execute_from_command_line # noqa + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", + "openstack_dashboard.settings") + execute_from_command_line(sys.argv) diff --git a/test-requirements.txt b/test-requirements.txt index a3cd0c7f..0bc717c2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,7 @@ hacking<0.11,>=0.10.0 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon coverage>=3.6 discover +django-nose>=1.2 python-subunit>=0.0.18 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 oslosphinx>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index c4464b30..a2ad3a48 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = python setup.py test --slowest --testr-args='{posargs}' +commands = python manage.py test [testenv:pep8] commands = flake8