openstack/horizon
Code Issues Proposed changes

Merge "Make xvfbwrapper import dependent on the selenium imports"

Browse Source
This commit is contained in:
Jenkins
2014-07-02 11:15:33 +00:00
committed by Gerrit Code Review
parent 82a448f616 29da865d45
commit 652cbcda3b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/test/helpers.py
View File

@@ -32,7 +32,6 @@ from django import test as django_test
from django.test.client import RequestFactory # noqa from django.test.client import RequestFactory # noqa
from django.utils.encoding import force_unicode from django.utils.encoding import force_unicode
from django.utils import unittest from django.utils import unittest
import xvfbwrapper
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -40,6 +39,7 @@ LOG = logging.getLogger(__name__)
try: try:
from horizon.test.webdriver import WebDriver # noqa from horizon.test.webdriver import WebDriver # noqa
from selenium.webdriver.support import ui as selenium_ui from selenium.webdriver.support import ui as selenium_ui
import xvfbwrapper # Only needed when running the Selenium tests headless
except ImportError as e: except ImportError as e:
# NOTE(saschpe): Several distribution can't ship selenium due to its # NOTE(saschpe): Several distribution can't ship selenium due to its
# non-free license. So they have to patch it out of test-requirements.txt # non-free license. So they have to patch it out of test-requirements.txt