floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decode urlopen response in pastebin 

Fix #1198
This commit is contained in:
Bruno Oliveira 2015-12-01 23:30:05 -02:00
parent f9b1e39b8a
commit 6a2ebddc7c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/pastebin.py
View File

@ -62,7 +62,7 @@ def create_new_paste(contents):
} }
url = 'https://bpaste.net' url = 'https://bpaste.net'
response = urlopen(url, data=urlencode(params).encode()).read() response = urlopen(url, data=urlencode(params).encode()).read()
m = re.search(r'href="/raw/(\w+)"', response) m = re.search(r'href="/raw/(\w+)"', response.decode())
if m: if m:
return '%s/show/%s' % (url, m.group(1)) return '%s/show/%s' % (url, m.group(1))
else: else:

5
testing/test_pastebin.py
View File

@ -1,7 +1,7 @@
import sys import sys
import pytest import pytest
class TestPasting: class TestPasteCapture:
@pytest.fixture @pytest.fixture
def pastebinlist(self, monkeypatch, request): def pastebinlist(self, monkeypatch, request):
@ -62,7 +62,7 @@ class TestPaste:
class DummyFile: class DummyFile:
def read(self): def read(self):
# part of html of a normal response # part of html of a normal response
return 'View <a href="/raw/3c0c6750bd">raw</a>.' return b'View <a href="/raw/3c0c6750bd">raw</a>.'
return DummyFile() return DummyFile()
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
@ -78,6 +78,7 @@ class TestPaste:
assert result == 'https://bpaste.net/show/3c0c6750bd' assert result == 'https://bpaste.net/show/3c0c6750bd'
assert len(mocked_urlopen) == 1 assert len(mocked_urlopen) == 1
url, data = mocked_urlopen[0] url, data = mocked_urlopen[0]
assert type(data) is bytes
lexer = 'python3' if sys.version_info[0] == 3 else 'python' lexer = 'python3' if sys.version_info[0] == 3 else 'python'
assert url == 'https://bpaste.net' assert url == 'https://bpaste.net'
assert 'lexer=%s' % lexer in data.decode() assert 'lexer=%s' % lexer in data.decode()