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

Rename Request.url to Request.path.

Browse Source
This commit is contained in:
Florian Bruhin 2015-10-13 07:11:02 +02:00
parent c052c8a107
commit 4bf6359205
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integration/webserver.py
View File

@ -34,7 +34,7 @@ from PyQt5.QtCore import pyqtSignal
import testprocess # pylint: disable=import-error import testprocess # pylint: disable=import-error
Request = collections.namedtuple('Request', 'verb, url') Request = collections.namedtuple('Request', 'verb, path')
class HTTPBin(testprocess.Process): class HTTPBin(testprocess.Process):
@ -59,7 +59,7 @@ class HTTPBin(testprocess.Process):
\ \[(?P<date>[^]]*)\] \ \[(?P<date>[^]]*)\]
\ "(?P<request> \ "(?P<request>
(?P<verb>[^ ]*) (?P<verb>[^ ]*)
\ (?P<url>[^ ]*) \ (?P<path>[^ ]*)
\ (?P<protocol>[^ ]*) \ (?P<protocol>[^ ]*)
)" )"
\ (?P<status>[^ ]*) \ (?P<status>[^ ]*)
@ -81,7 +81,8 @@ class HTTPBin(testprocess.Process):
def get_requests(self): def get_requests(self):
"""Get the requests to the server during this test.""" """Get the requests to the server during this test."""
return self._get_data() requests = self._get_data()
return [r for r in requests if r.path != '/favicon.ico']
def _parse_line(self, line): def _parse_line(self, line):
print(line) print(line)
@ -96,7 +97,7 @@ class HTTPBin(testprocess.Process):
# FIXME do we need to allow other options? # FIXME do we need to allow other options?
assert match.group('protocol') == 'HTTP/1.1' assert match.group('protocol') == 'HTTP/1.1'
return Request(verb=match.group('verb'), url=match.group('url')) return Request(verb=match.group('verb'), path=match.group('path'))
def _executable_args(self): def _executable_args(self):
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen'):