openstack/zaqar-ui
Code Issues Proposed changes

Fixes test settings

Browse Source 
We should be using the openstack test settings instead of the zaqar test
settings, which does not exist at the moment and is causing the gate checks
to fail.

Change-Id: I5c82a52d24fb579957aa6b020c2a4915024e3519
This commit is contained in:
Thai Tran 2016-02-02 11:35:33 -08:00
parent 08d9d60dd8
commit 549053d5df
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -34,7 +34,7 @@ sys.path.insert(0, ROOT)
# This is required for ReadTheDocs.org, but isn't a bad idea anyway. # This is required for ReadTheDocs.org, but isn't a bad idea anyway.
os.environ.setdefault('DJANGO_SETTINGS_MODULE', os.environ.setdefault('DJANGO_SETTINGS_MODULE',
'zaqar_ui.test.settings') 'openstack_dashboard.test.settings')
from zaqar_ui \ from zaqar_ui \
import version as zaqarui_ver import version as zaqarui_ver

2
manage.py
View File

@ -19,5 +19,5 @@ from django.core.management import execute_from_command_line # noqa
if __name__ == "__main__": if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", os.environ.setdefault("DJANGO_SETTINGS_MODULE",
"zaqar_ui.test.settings") "openstack_dashboard.settings")
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)

6
run_tests.sh
View File

@ -187,7 +187,7 @@ function warn_on_flake8_without_venv {
function run_pep8 { function run_pep8 {
echo "Running flake8 ..." echo "Running flake8 ..."
warn_on_flake8_without_venv warn_on_flake8_without_venv
DJANGO_SETTINGS_MODULE=zaqar_ui.test.settings ${command_wrapper} flake8 DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings ${command_wrapper} flake8
} }
function run_pep8_changed { function run_pep8_changed {
@ -200,13 +200,13 @@ function run_pep8_changed {
files=$(git diff --name-only $base_commit | tr '\n' ' ') files=$(git diff --name-only $base_commit | tr '\n' ' ')
echo "Running flake8 on ${files}" echo "Running flake8 on ${files}"
warn_on_flake8_without_venv warn_on_flake8_without_venv
diff -u --from-file /dev/null ${files} | DJANGO_SETTINGS_MODULE=zaqar_ui.test.settings ${command_wrapper} flake8 --diff diff -u --from-file /dev/null ${files} | DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings ${command_wrapper} flake8 --diff
exit exit
} }
function run_sphinx { function run_sphinx {
echo "Building sphinx..." echo "Building sphinx..."
DJANGO_SETTINGS_MODULE=zaqar_ui.test.settings ${command_wrapper} python setup.py build_sphinx DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings ${command_wrapper} python setup.py build_sphinx
echo "Build complete." echo "Build complete."
} }