rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Florian Bruhin 2017-02-07 00:38:43 +01:00
parent d13809089f
commit eb7064d083
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/end2end/test_mhtml_e2e.py
View File

@ -82,6 +82,23 @@ def download_dir(tmpdir):
return DownloadDir(tmpdir) return DownloadDir(tmpdir)
def _test_mhtml_requests(test_dir, test_path, httpbin):
with open(os.path.join(test_dir, 'requests'), encoding='utf-8') as f:
expected_requests = []
for line in f:
if line.startswith('#'):
continue
path = '/{}/{}'.format(test_path, line.strip())
expected_requests.append(httpbin.ExpectedRequest('GET', path))
actual_requests = httpbin.get_requests()
# Requests are not hashable, we need to convert to ExpectedRequests
actual_requests = [httpbin.ExpectedRequest.from_request(req)
for req in actual_requests]
assert (collections.Counter(actual_requests) ==
collections.Counter(expected_requests))
@pytest.mark.parametrize('test_name', collect_tests()) @pytest.mark.parametrize('test_name', collect_tests())
def test_mhtml(request, test_name, download_dir, quteproc, httpbin): def test_mhtml(request, test_name, download_dir, quteproc, httpbin):
quteproc.set_setting('storage', 'download-directory', quteproc.set_setting('storage', 'download-directory',
@ -113,20 +130,5 @@ def test_mhtml(request, test_name, download_dir, quteproc, httpbin):
expected_file = os.path.join(test_dir, filename) expected_file = os.path.join(test_dir, filename)
download_dir.compare_mhtml(expected_file) download_dir.compare_mhtml(expected_file)
if request.config.webengine: if not request.config.webengine:
return _test_mhtml_requests(test_dir, test_path, httpbin)
with open(os.path.join(test_dir, 'requests'), encoding='utf-8') as f:
expected_requests = []
for line in f:
if line.startswith('#'):
continue
path = '/{}/{}'.format(test_path, line.strip())
expected_requests.append(httpbin.ExpectedRequest('GET', path))
actual_requests = httpbin.get_requests()
# Requests are not hashable, we need to convert to ExpectedRequests
actual_requests = [httpbin.ExpectedRequest.from_request(req)
for req in actual_requests]
assert (collections.Counter(actual_requests) ==
collections.Counter(expected_requests))