Workaround for 'File exists' test failure

Adds code to create the assets directory that django_pyscss
intends to create for scss.  This avoids throwing an exception
in concurrency scenarios

Change-Id: Ic55e2a7ce59ec9b7550a7412697cb8d6563d98a3
Closes-bug: #1367590
This commit is contained in:
Doug Fish 2014-09-22 10:50:12 -05:00
parent 8a1c59ca4f
commit fc981d2e37
3 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,36 @@
# 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.
import logging
import os
from django.conf import settings
scss_asset_root = os.path.join(settings.STATIC_ROOT, 'scss', 'assets')
LOG = logging.getLogger(__name__)
"""
This is a workaround for https://bugs.launchpad.net/horizon/+bug/1367590
It works by creating a path that django_scss will attempt to create
later if it doesn't exist. The django_pyscss code fails
intermittantly because of concurrency issues. This code ignores the
exception and if it was anything other than the concurrency issue
django_pyscss will discover the problem later.
TODO (doug-fish): remove this workaround once fix for
https://github.com/fusionbox/django-pyscss/issues/23 is picked up.
"""
try:
if not os.path.exists(scss_asset_root):
os.makedirs(scss_asset_root)
except Exception as e:
LOG.info("Error precreating path %s, %s" % (scss_asset_root, e))

View File

@ -207,6 +207,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'django.contrib.humanize',
'django_pyscss',
'openstack_dashboard.django_pyscss_fix',
'compressor',
'horizon',
'openstack_auth',

View File

@ -19,6 +19,7 @@ from openstack_dashboard import exceptions
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'))
SECRET_KEY = secret_key.generate_or_read_from_file(
os.path.join(TEST_DIR, '.secret_key_store'))