mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-14 13:33:00 +00:00
update tests with new default server ip ('')
and verify that starting a Spawner sets ip to localhost
This commit is contained in:
@@ -22,7 +22,7 @@ def db():
|
|||||||
"""Get a db session"""
|
"""Get a db session"""
|
||||||
global _db
|
global _db
|
||||||
if _db is None:
|
if _db is None:
|
||||||
_db = orm.new_session_factory('sqlite:///:memory:', echo=True)()
|
_db = orm.new_session_factory('sqlite:///:memory:')()
|
||||||
user = orm.User(
|
user = orm.User(
|
||||||
name=getuser(),
|
name=getuser(),
|
||||||
server=orm.Server(),
|
server=orm.Server(),
|
||||||
|
@@ -14,12 +14,12 @@ def test_server(db):
|
|||||||
server = orm.Server()
|
server = orm.Server()
|
||||||
db.add(server)
|
db.add(server)
|
||||||
db.commit()
|
db.commit()
|
||||||
assert server.ip == 'localhost'
|
assert server.ip == ''
|
||||||
assert server.base_url == '/'
|
assert server.base_url == '/'
|
||||||
assert server.proto == 'http'
|
assert server.proto == 'http'
|
||||||
assert isinstance(server.port, int)
|
assert isinstance(server.port, int)
|
||||||
assert isinstance(server.cookie_name, str)
|
assert isinstance(server.cookie_name, str)
|
||||||
assert server.url == 'http://localhost:%i/' % server.port
|
assert server.url == 'http://*:%i/' % server.port
|
||||||
|
|
||||||
|
|
||||||
def test_proxy(db):
|
def test_proxy(db):
|
||||||
@@ -65,7 +65,7 @@ def test_user(db):
|
|||||||
db.add(user)
|
db.add(user)
|
||||||
db.commit()
|
db.commit()
|
||||||
assert user.name == 'kaylee'
|
assert user.name == 'kaylee'
|
||||||
assert user.server.ip == 'localhost'
|
assert user.server.ip == ''
|
||||||
assert user.state == {'pid': 4234}
|
assert user.state == {'pid': 4234}
|
||||||
|
|
||||||
found = orm.User.find(db, 'kaylee')
|
found = orm.User.find(db, 'kaylee')
|
||||||
|
@@ -45,6 +45,7 @@ def new_spawner(db, **kwargs):
|
|||||||
def test_spawner(db, io_loop):
|
def test_spawner(db, io_loop):
|
||||||
spawner = new_spawner(db)
|
spawner = new_spawner(db)
|
||||||
io_loop.run_sync(spawner.start)
|
io_loop.run_sync(spawner.start)
|
||||||
|
assert spawner.user.server.ip == 'localhost'
|
||||||
|
|
||||||
# wait for the process to get to the while True: loop
|
# wait for the process to get to the while True: loop
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
Reference in New Issue
Block a user