openstack
/
horizon
Code Issues Proposed changes

Merge "HTML test report only when nosehtmloutput is installed"

This commit is contained in:
Jenkins 2017-06-13 17:48:47 +00:00 committed by Gerrit Code Review
parent 12fe351823 4ab2877d1f
commit 41d6a5352e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack_dashboard/test/settings.py
View File

@ -245,7 +245,16 @@ NOSE_ARGS = ['--nocapture',
'--all-modules']
# TODO(amotoki): Need to investigate why --with-html-output
# is unavailable in python3.
if six.PY2:
# NOTE(amotoki): Most horizon plugins import this module in their test
# settings and they do not necessarily have nosehtmloutput in test-reqs.
# Assuming nosehtmloutput potentially breaks plugins tests,
# we check the availability of htmloutput module (from nosehtmloutput).
try:
import htmloutput # noqa: F401
has_html_output = True
except ImportError:
has_html_output = False
if six.PY2 and has_html_output:
NOSE_ARGS += ['--with-html-output',
'--html-out-file=ut_openstack_dashboard_nose_results.html']