openstack
/
horizon
Code Issues Proposed changes

Merge "Fixes Selenium tests for openstack_dashboard"

This commit is contained in:
Jenkins 2015-08-21 01:37:13 +00:00 committed by Gerrit Code Review
parent 943a57b536 654b1a61b0
commit 5adb2c42b6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/test/settings.py
View File

@ -15,6 +15,7 @@ import os
from horizon.test.settings import * # noqa
from horizon.utils import secret_key
from openstack_dashboard import exceptions
from openstack_dashboard.static_settings import find_static_files # noqa
from openstack_dashboard.static_settings import get_staticfiles_dirs # noqa
STATICFILES_DIRS = get_staticfiles_dirs()
@ -22,6 +23,8 @@ STATICFILES_DIRS = get_staticfiles_dirs()
TEST_DIR = os.path.dirname(os.path.abspath(__file__))
ROOT_PATH = os.path.abspath(os.path.join(TEST_DIR, ".."))
STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
STATIC_URL = '/static/'
WEBROOT = '/'
SECRET_KEY = secret_key.generate_or_read_from_file(
os.path.join(TEST_DIR, '.secret_key_store'))
@ -84,6 +87,8 @@ settings.update_dashboards(
)
INSTALLED_APPS[0:0] = []
find_static_files(ROOT_PATH, HORIZON_CONFIG)
# Set to True to allow users to upload images to glance via Horizon server.
# When enabled, a file form field will appear on the create image form.
# See documentation for deployment considerations.