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

Fix lint.

Browse Source
This commit is contained in:
Florian Bruhin 2016-01-13 06:41:22 +01:00
parent 0ca9cd361a
commit e17a332400
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/features/test_prompts.py
View File

@ -28,7 +28,7 @@ def load_ssl_page(quteproc, ssl_server):
@bdd.when("I wait until the SSL page finished loading") @bdd.when("I wait until the SSL page finished loading")
def load_ssl_page(quteproc, ssl_server): def wait_ssl_page_finished_loading(quteproc, ssl_server):
quteproc.wait_for_load_finished('/', port=ssl_server.port, https=True, quteproc.wait_for_load_finished('/', port=ssl_server.port, https=True,
load_status='warn') load_status='warn')

16
tests/integration/webserver_sub_ssl.py
View File

@ -24,12 +24,13 @@ This script gets called as a QProcess from integration/conftest.py.
import ssl import ssl
import sys import sys
import json
import logging import logging
import os.path import os.path
import flask import flask
import webserver_sub
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -41,15 +42,7 @@ def hello_world():
@app.after_request @app.after_request
def log_request(response): def log_request(response):
"""Log a webserver request.""" return webserver_sub.log_request(response)
request = flask.request
data = {
'verb': request.method,
'path': request.full_path if request.query_string else request.path,
'status': response.status_code,
}
print(json.dumps(data), file=sys.stderr, flush=True)
return response
@app.before_first_request @app.before_first_request
@ -61,7 +54,8 @@ def turn_off_logging():
def main(): def main():
ssl_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), ssl_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
'data', 'ssl') 'data', 'ssl')
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) # WORKAROUND for https://github.com/PyCQA/pylint/issues/399
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) # pylint: disable=no-member
context.load_cert_chain(os.path.join(ssl_dir, 'cert.pem'), context.load_cert_chain(os.path.join(ssl_dir, 'cert.pem'),
os.path.join(ssl_dir, 'key.pem')) os.path.join(ssl_dir, 'key.pem'))
app.run(port=int(sys.argv[1]), debug=False, ssl_context=context) app.run(port=int(sys.argv[1]), debug=False, ssl_context=context)