hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 15:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pep8 errors

Browse Source
This commit is contained in:
Carol Willing
2017-01-23 12:37:44 -08:00
parent 142907395f
commit 7f6c080b46
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jupyterhub/tests/test_proxy.py
View File

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
"""Test a proxy being started before the Hub""" """Test a proxy being started before the Hub"""
import json import json
@@ -21,7 +19,7 @@ def test_external_proxy(request, io_loop):
auth_token = 'secret!' auth_token = 'secret!'
proxy_ip = '127.0.0.1' proxy_ip = '127.0.0.1'
proxy_port = 54321 proxy_port = 54321
app = MockHub.instance( app = MockHub.instance(
proxy_api_ip=proxy_ip, proxy_api_ip=proxy_ip,
proxy_api_port=proxy_port, proxy_api_port=proxy_port,
@@ -49,14 +47,14 @@ def test_external_proxy(request, io_loop):
if proxy.poll() is None: if proxy.poll() is None:
proxy.terminate() proxy.terminate()
request.addfinalizer(_cleanup_proxy) request.addfinalizer(_cleanup_proxy)
def wait_for_proxy(): def wait_for_proxy():
io_loop.run_sync(lambda: wait_for_http_server( io_loop.run_sync(lambda: wait_for_http_server(
'http://%s:%i' % (proxy_ip, proxy_port))) 'http://%s:%i' % (proxy_ip, proxy_port)))
wait_for_proxy() wait_for_proxy()
app.start([]) app.start([])
assert app.proxy_process is None assert app.proxy_process is None
routes = io_loop.run_sync(app.proxy.get_routes) routes = io_loop.run_sync(app.proxy.get_routes)
@@ -80,18 +78,18 @@ def test_external_proxy(request, io_loop):
proxy.terminate() proxy.terminate()
proxy = Popen(cmd, env=env) proxy = Popen(cmd, env=env)
wait_for_proxy() wait_for_proxy()
routes = io_loop.run_sync(app.proxy.get_routes) routes = io_loop.run_sync(app.proxy.get_routes)
assert list(routes.keys()) == ['/'] assert list(routes.keys()) == ['/']
# poke the server to update the proxy # poke the server to update the proxy
r = api_request(app, 'proxy', method='post') r = api_request(app, 'proxy', method='post')
r.raise_for_status() r.raise_for_status()
# check that the routes are correct # check that the routes are correct
routes = io_loop.run_sync(app.proxy.get_routes) routes = io_loop.run_sync(app.proxy.get_routes)
assert sorted(routes.keys()) == ['/', user_path] assert sorted(routes.keys()) == ['/', user_path]
# teardown the proxy, and start a new one with different auth and port # teardown the proxy, and start a new one with different auth and port
proxy.terminate() proxy.terminate()
new_auth_token = 'different!' new_auth_token = 'different!'
@@ -108,7 +106,7 @@ def test_external_proxy(request, io_loop):
cmd.append('--host-routing') cmd.append('--host-routing')
proxy = Popen(cmd, env=env) proxy = Popen(cmd, env=env)
wait_for_proxy() wait_for_proxy()
# tell the hub where the new proxy is # tell the hub where the new proxy is
r = api_request(app, 'proxy', method='patch', data=json.dumps({ r = api_request(app, 'proxy', method='patch', data=json.dumps({
'port': proxy_port, 'port': proxy_port,
@@ -118,16 +116,16 @@ def test_external_proxy(request, io_loop):
})) }))
r.raise_for_status() r.raise_for_status()
assert app.proxy.api_server.port == proxy_port assert app.proxy.api_server.port == proxy_port
# get updated auth token from main thread # get updated auth token from main thread
def get_app_proxy_token(): def get_app_proxy_token():
q = Queue() q = Queue()
app.io_loop.add_callback(lambda: q.put(app.proxy.auth_token)) app.io_loop.add_callback(lambda: q.put(app.proxy.auth_token))
return q.get(timeout=2) return q.get(timeout=2)
assert get_app_proxy_token() == new_auth_token assert get_app_proxy_token() == new_auth_token
app.proxy.auth_token = new_auth_token app.proxy.auth_token = new_auth_token
# check that the routes are correct # check that the routes are correct
routes = io_loop.run_sync(app.proxy.get_routes) routes = io_loop.run_sync(app.proxy.get_routes)
assert sorted(routes.keys()) == ['/', user_path] assert sorted(routes.keys()) == ['/', user_path]