Merge "test: use safer way to override settings"
This commit is contained in:
commit
930c5a6138
|
@ -12,7 +12,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from openstack_dashboard.test import helpers as test
|
from openstack_dashboard.test import helpers as test
|
||||||
|
@ -32,9 +31,13 @@ class UserSettingsTest(test.TestCase):
|
||||||
|
|
||||||
def test_display_language(self):
|
def test_display_language(self):
|
||||||
# Add an unknown language to LANGUAGES list
|
# Add an unknown language to LANGUAGES list
|
||||||
settings.LANGUAGES += (('unknown', 'Unknown Language'),)
|
with self.modify_settings(
|
||||||
|
# NOTE: modify_settings take a list of values to append.
|
||||||
|
# We add a single entry but it is a tuple,
|
||||||
|
# so we need to wrap it as a list.
|
||||||
|
LANGUAGES={'append': [('unknown', 'Unknown Language')]}):
|
||||||
|
res = self.client.get(INDEX_URL)
|
||||||
|
|
||||||
res = self.client.get(INDEX_URL)
|
|
||||||
# Known language
|
# Known language
|
||||||
self.assertContains(res, 'English')
|
self.assertContains(res, 'English')
|
||||||
# Unknown language
|
# Unknown language
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from horizon import exceptions
|
from horizon import exceptions
|
||||||
|
|
||||||
from openstack_dashboard.api import base as api_base
|
from openstack_dashboard.api import base as api_base
|
||||||
|
@ -232,21 +230,22 @@ class ApiVersionTests(test.TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(ApiVersionTests, self).setUp()
|
super(ApiVersionTests, self).setUp()
|
||||||
self.previous_settings = settings.OPENSTACK_API_VERSIONS
|
override = self.settings(
|
||||||
settings.OPENSTACK_API_VERSIONS = {
|
OPENSTACK_API_VERSIONS={
|
||||||
"data-processing": 1.1,
|
"data-processing": 1.1,
|
||||||
"identity": "3",
|
"identity": "3",
|
||||||
"volume": 1
|
"volume": 1
|
||||||
}
|
}
|
||||||
# Make sure cached data from other tests doesn't interfere
|
)
|
||||||
cinder.VERSIONS.clear_active_cache()
|
override.enable()
|
||||||
keystone.VERSIONS.clear_active_cache()
|
self.addCleanup(override.disable)
|
||||||
glance.VERSIONS.clear_active_cache()
|
|
||||||
|
|
||||||
def tearDown(self):
|
# Make sure cached data from other tests doesn't interfere
|
||||||
super(ApiVersionTests, self).tearDown()
|
self._clear_version_cache()
|
||||||
settings.OPENSTACK_API_VERSIONS = self.previous_settings
|
|
||||||
# Clear out our bogus data so it doesn't interfere
|
# Clear out our bogus data so it doesn't interfere
|
||||||
|
self.addCleanup(self._clear_version_cache)
|
||||||
|
|
||||||
|
def _clear_version_cache(self):
|
||||||
cinder.VERSIONS.clear_active_cache()
|
cinder.VERSIONS.clear_active_cache()
|
||||||
keystone.VERSIONS.clear_active_cache()
|
keystone.VERSIONS.clear_active_cache()
|
||||||
glance.VERSIONS.clear_active_cache()
|
glance.VERSIONS.clear_active_cache()
|
||||||
|
|
Loading…
Reference in New Issue