Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix path of CSS and JS files used in html report. #591

Merged
merged 1 commit into from
Jun 21, 2016

Conversation

kdexd
Copy link

@kdexd kdexd commented Jun 20, 2016

In tardis/tests/tests_slow/report.py:

 style_css = pkg_resources.resource_string(
            __name__, os.path.join('resources', 'style.css'))

and

 main_js = pkg_resources.resource_string(
            __name__, os.path.join('resources', 'main.js'))

...read from the pytest-html's files.

But here, __name__ = 'tardis/tests/tests_slow/report', which is incorrect.
So it is changed to pytest_html.__name__ for avoiding OSError.

@@ -33,6 +33,7 @@
from socket import gaierror

from py.xml import html, raw
import pytest_html
from pytest_html.plugin import HTMLReport
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add import __name__ as pytest_path

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume that you mean pytest_html.__name__. I'm changing it. 😀

@kdexd kdexd force-pushed the dokureport-css-js-fix branch from 6909501 to 343812b Compare June 20, 2016 14:09
@kdexd kdexd force-pushed the dokureport-css-js-fix branch from 343812b to a4e5ff8 Compare June 20, 2016 14:49
@yeganer
Copy link
Contributor

yeganer commented Jun 21, 2016

@tardis-sn/tardis-core I'm happy to merge. This is a small bugfix.

@wkerzendorf wkerzendorf merged commit a23b8c1 into tardis-sn:master Jun 21, 2016
@kdexd kdexd deleted the dokureport-css-js-fix branch June 22, 2016 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants