Commit b059d37b by Christine Lytwynec

skipping the firefox version validation if firefox is not the browser being used

parent ed68b0ab
...@@ -7,6 +7,7 @@ from pavelib.utils.test.suites.bokchoy_suite import BokChoyTestSuite ...@@ -7,6 +7,7 @@ from pavelib.utils.test.suites.bokchoy_suite import BokChoyTestSuite
from pavelib.utils.envs import Env from pavelib.utils.envs import Env
from pavelib.utils.test.utils import check_firefox_version from pavelib.utils.test.utils import check_firefox_version
from optparse import make_option from optparse import make_option
import os
try: try:
from pygments.console import colorize from pygments.console import colorize
...@@ -40,9 +41,14 @@ def test_bokchoy(options): ...@@ -40,9 +41,14 @@ def test_bokchoy(options):
- path/to/test.py:TestFoo.test_bar - path/to/test.py:TestFoo.test_bar
It can also be left blank to run all tests in the suite. It can also be left blank to run all tests in the suite.
""" """
if getattr(options, 'validate_firefox_version', True): # Note: Bok Choy uses firefox if SELENIUM_BROWSER is not set. So we are using
# firefox as the default here.
using_firefox = (os.environ.get('SELENIUM_BROWSER', 'firefox') == 'firefox')
validate_firefox = getattr(options, 'validate_firefox_version', using_firefox)
if validate_firefox:
check_firefox_version() check_firefox_version()
opts = { opts = {
'test_spec': getattr(options, 'test_spec', None), 'test_spec': getattr(options, 'test_spec', None),
'fasttest': getattr(options, 'fasttest', False), 'fasttest': getattr(options, 'fasttest', False),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment