Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix for including a screenshot bug on Windows (#124) #136

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 4, 2018
Merged

Fix for including a screenshot bug on Windows (#124) #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
844c0fd
Fix for including a screenshot bug on Windows (#124)
pinkie1378 Nov 8, 2017
3057778
Merge branch 'master' into 124-windows-screenshot
pinkie1378 Jan 3, 2018
7a72672
Improve content state variable name (#124).
pinkie1378 Jan 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pytest_html/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from __future__ import absolute_import

from base64 import b64encode, b64decode
from os.path import isfile
import datetime
import json
import os
Expand Down Expand Up @@ -159,8 +160,14 @@ def append_extra_html(self, extra, extra_index, test_index):
href = None
if extra.get('format') == extras.FORMAT_IMAGE:
content = extra.get('content')
if content.startswith(('file', 'http')) or \
os.path.isfile(content):
try:
is_uri_or_path = (content.startswith(('file', 'http')) or
isfile(content))
except ValueError:
# On Windows, os.path.isfile throws this exception when
# passed a b64 encoded image.
is_uri_or_path = False
if is_uri_or_path:
if self.self_contained:
warnings.warn('Self-contained HTML report '
'includes link to external '
Expand Down
6 changes: 6 additions & 0 deletions testing/test_pytest_html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ def pytest_runtest_makereport(item, call):
src = 'data:{0};base64,{1}'.format(mime_type, content)
assert '<img src="{0}"/>'.format(src) in html

def test_extra_image_windows(self, mocker, testdir):
mock_isfile = mocker.patch('pytest_html.plugin.isfile')
mock_isfile.side_effect = ValueError('stat: path too long for Windows')
self.test_extra_image(testdir, 'image/png', 'png')
assert mock_isfile.call_count == 1

@pytest.mark.parametrize('content', [
("u'\u0081'"),
("'foo'"),
Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ commands = pytest -v -r a {posargs}
deps =
pytest-xdist
pytest-rerunfailures
pytest-mock
py{27,36,py,py3}-ansi2html: ansi2html

[testenv:flake8]
Expand Down