hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-13 04:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant/unused code in mockservice fixture

Browse Source
This commit is contained in:
Min RK
2017-04-04 15:40:46 +02:00
parent 39fce0304d
commit 5b1435081a
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jupyterhub/tests/conftest.py
View File

@@ -77,15 +77,10 @@ def _mockservice(request, app, url=False):
'admin': True, 'admin': True,
} }
if url: if url:
spec['url'] = 'http://127.0.0.1:%i' % random_port(), spec['url'] = 'http://127.0.0.1:%i' % random_port()
with mock.patch.object(jupyterhub.services.service, '_ServiceSpawner', MockServiceSpawner): with mock.patch.object(jupyterhub.services.service, '_ServiceSpawner', MockServiceSpawner):
app.services = [{ app.services = [spec]
'name': name,
'command': mockservice_cmd,
'url': 'http://127.0.0.1:%i' % random_port(),
'admin': True,
}]
app.init_services() app.init_services()
app.io_loop.add_callback(app.proxy.add_all_services, app._service_map) app.io_loop.add_callback(app.proxy.add_all_services, app._service_map)
assert name in app._service_map assert name in app._service_map

2
jupyterhub/tests/mockservice.py
View File

@@ -70,7 +70,7 @@ class OWhoAmIHandler(HubOAuthenticated, web.RequestHandler):
def main(): def main():
pprint.pprint(dict(os.environ), stream=sys.stderr) pprint.pprint(dict(os.environ), stream=sys.stderr)
if os.environ['JUPYTERHUB_SERVICE_URL']: if os.getenv('JUPYTERHUB_SERVICE_URL'):
url = urlparse(os.environ['JUPYTERHUB_SERVICE_URL']) url = urlparse(os.environ['JUPYTERHUB_SERVICE_URL'])
app = web.Application([ app = web.Application([
(r'.*/env', EnvHandler), (r'.*/env', EnvHandler),

6
jupyterhub/tests/test_api.py
View File

@@ -723,7 +723,8 @@ def test_group_delete_users(app):
@mark.services @mark.services
def test_get_services(app, mockservice): def test_get_services(app, mockservice_url):
mockservice = mockservice_url
db = app.db db = app.db
r = api_request(app, 'services') r = api_request(app, 'services')
r.raise_for_status() r.raise_for_status()
@@ -748,7 +749,8 @@ def test_get_services(app, mockservice):
@mark.services @mark.services
def test_get_service(app, mockservice): def test_get_service(app, mockservice_url):
mockservice = mockservice_url
db = app.db db = app.db
r = api_request(app, 'services/%s' % mockservice.name) r = api_request(app, 'services/%s' % mockservice.name)
r.raise_for_status() r.raise_for_status()