openstack/horizon
Code Issues Proposed changes

Merge "Fix logspam in django 1.9 and django 1.10 tests"

Browse Source
This commit is contained in:
Jenkins 2016-11-09 00:43:08 +00:00 committed by Gerrit Code Review
commit d6beeb370a
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
openstack_dashboard/contrib/developer/theme_preview/tests.py
View File

@ -1,46 +0,0 @@
# Copyright 2015 Cisco Systems, Inc.
#
# 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.
from django.conf import settings
from django.core import urlresolvers
from django.core.urlresolvers import reverse
from importlib import import_module
from six import moves
from horizon import base
from openstack_dashboard.contrib.developer.dashboard import Developer
from openstack_dashboard.test import helpers as test
class ThemePreviewTests(test.TestCase):
# Manually register Developer Dashboard, as DEBUG=False in tests
def setUp(self):
super(ThemePreviewTests, self).setUp()
urlresolvers.clear_url_caches()
moves.reload_module(import_module(settings.ROOT_URLCONF))
base.Horizon.register(Developer)
base.Horizon._urls()
def tearDown(self):
super(ThemePreviewTests, self).tearDown()
base.Horizon.unregister(Developer)
base.Horizon._urls()
def test_index(self):
index = reverse('horizon:developer:theme_preview:index')
res = self.client.get(index)
self.assertTemplateUsed(res, 'developer/theme_preview/index.html')

2
openstack_dashboard/test/settings.py
View File

@ -108,7 +108,6 @@ STATICFILES_DIRS = settings_utils.get_xstatic_dirs(
) )
# Load the pluggable dashboard settings # Load the pluggable dashboard settings
import openstack_dashboard.contrib.developer.enabled
import openstack_dashboard.enabled import openstack_dashboard.enabled
import openstack_dashboard.local.enabled import openstack_dashboard.local.enabled
@ -117,7 +116,6 @@ settings_utils.update_dashboards(
[ [
openstack_dashboard.enabled, openstack_dashboard.enabled,
openstack_dashboard.local.enabled, openstack_dashboard.local.enabled,
openstack_dashboard.contrib.developer.enabled
], ],
HORIZON_CONFIG, HORIZON_CONFIG,
INSTALLED_APPS, INSTALLED_APPS,