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

Merge pull request #838 from minrk/ensure-strings

Browse Source 
quotes around single-user CLI args
This commit is contained in:
Carol Willing
2016-11-01 14:05:56 -07:00
committed by GitHub
parent c174ec42f0 7da7f7e074
commit faef34e4ff
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jupyterhub/spawner.py
View File

@@ -298,15 +298,15 @@ class Spawner(LoggingConfigurable):
def get_args(self): def get_args(self):
"""Return the arguments to be passed after self.cmd""" """Return the arguments to be passed after self.cmd"""
args = [ args = [
'--user=%s' % self.user.name, '--user="%s"' % self.user.name,
'--cookie-name=%s' % self.user.server.cookie_name, '--cookie-name="%s"' % self.user.server.cookie_name,
'--base-url=%s' % self.user.server.base_url, '--base-url="%s"' % self.user.server.base_url,
'--hub-host=%s' % self.hub.host, '--hub-host="%s"' % self.hub.host,
'--hub-prefix=%s' % self.hub.server.base_url, '--hub-prefix="%s"' % self.hub.server.base_url,
'--hub-api-url=%s' % self.hub.api_url, '--hub-api-url="%s"' % self.hub.api_url,
] ]
if self.ip: if self.ip:
args.append('--ip=%s' % self.ip) args.append('--ip="%s"' % self.ip)
if self.port: if self.port:
args.append('--port=%i' % self.port) args.append('--port=%i' % self.port)
@@ -316,10 +316,10 @@ class Spawner(LoggingConfigurable):
if self.notebook_dir: if self.notebook_dir:
notebook_dir = self.format_string(self.notebook_dir) notebook_dir = self.format_string(self.notebook_dir)
args.append('--notebook-dir=%s' % notebook_dir) args.append('--notebook-dir="%s"' % notebook_dir)
if self.default_url: if self.default_url:
default_url = self.format_string(self.default_url) default_url = self.format_string(self.default_url)
args.append('--NotebookApp.default_url=%s' % default_url) args.append('--NotebookApp.default_url="%s"' % default_url)
if self.debug: if self.debug:
args.append('--debug') args.append('--debug')

4
jupyterhub/tests/test_api.py
View File

@@ -390,10 +390,10 @@ def test_spawn(app, io_loop):
r = requests.get(ujoin(url, 'args')) r = requests.get(ujoin(url, 'args'))
assert r.status_code == 200 assert r.status_code == 200
argv = r.json() argv = r.json()
for expected in ['--user=%s' % name, '--base-url=%s' % user.server.base_url]: for expected in ['--user="%s"' % name, '--base-url="%s"' % user.server.base_url]:
assert expected in argv assert expected in argv
if app.subdomain_host: if app.subdomain_host:
assert '--hub-host=%s' % app.subdomain_host in argv assert '--hub-host="%s"' % app.subdomain_host in argv
r = api_request(app, 'users', name, 'server', method='delete') r = api_request(app, 'users', name, 'server', method='delete')
assert r.status_code == 204 assert r.status_code == 204