From 549053d5df1b825d0cf1d3000e522b3fc4c7bc55 Mon Sep 17 00:00:00 2001
From: Thai Tran <tqtran@us.ibm.com>
Date: Tue, 2 Feb 2016 11:35:33 -0800
Subject: [PATCH] Fixes test settings

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
---
 doc/source/conf.py | 2 +-
 manage.py          | 2 +-
 run_tests.sh       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8211396..24ec15d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -34,7 +34,7 @@ sys.path.insert(0, ROOT)
 
 # This is required for ReadTheDocs.org, but isn't a bad idea anyway.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                      'zaqar_ui.test.settings')
+                      'openstack_dashboard.test.settings')
 
 from zaqar_ui \
     import version as zaqarui_ver
diff --git a/manage.py b/manage.py
index dde2490..5818a6d 100755
--- a/manage.py
+++ b/manage.py
@@ -19,5 +19,5 @@ from django.core.management import execute_from_command_line  # noqa
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-                          "zaqar_ui.test.settings")
+                          "openstack_dashboard.settings")
     execute_from_command_line(sys.argv)
diff --git a/run_tests.sh b/run_tests.sh
index 212f565..1342187 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -187,7 +187,7 @@ function warn_on_flake8_without_venv {
 function run_pep8 {
   echo "Running flake8 ..."
   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 {
@@ -200,13 +200,13 @@ function run_pep8_changed {
     files=$(git diff --name-only $base_commit | tr '\n' ' ')
     echo "Running flake8 on ${files}"
     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
 }
 
 function run_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."
 }