Skip to content

Commit dc85cdc

Browse files
committed
Remove pre jh 0.9.0 required test code
1 parent 959a5ef commit dc85cdc

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

batchspawner/tests/test_spawners.py

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from traitlets import Unicode
77
import time
88
import pytest
9-
from jupyterhub import orm, version_info
9+
from jupyterhub import orm
1010
from tornado import gen
1111

1212
try:
@@ -61,25 +61,18 @@ def run_command(self, *args, **kwargs):
6161
def new_spawner(db, spawner_class=BatchDummy, **kwargs):
6262
kwargs.setdefault("cmd", ["singleuser_command"])
6363
user = db.query(orm.User).first()
64-
if version_info < (0, 8):
65-
hub = db.query(orm.Hub).first()
66-
else:
67-
hub = Hub()
68-
user = User(user, {})
69-
server = Server()
70-
# Set it after constructions because it isn't a traitlet.
64+
hub = Hub()
65+
user = User(user, {})
66+
server = Server()
67+
# Set it after constructions because it isn't a traitlet.
7168
kwargs.setdefault("hub", hub)
7269
kwargs.setdefault("user", user)
7370
kwargs.setdefault("poll_interval", 1)
74-
if version_info < (0, 8):
75-
spawner = spawner_class(db=db, **kwargs)
76-
spawner.mock_port = testport
77-
else:
78-
print("JupyterHub >=0.8 detected, using new spawner creation")
79-
# These are not traitlets so we have to set them here
80-
spawner = user._new_spawner("", spawner_class=spawner_class, **kwargs)
81-
spawner.server = server
82-
spawner.mock_port = testport
71+
72+
# These are not traitlets so we have to set them here
73+
spawner = user._new_spawner("", spawner_class=spawner_class, **kwargs)
74+
spawner.server = server
75+
spawner.mock_port = testport
8376
return spawner
8477

8578

@@ -91,10 +84,7 @@ def test_stress_submit(db, io_loop):
9184

9285

9386
def check_ip(spawner, value):
94-
if version_info < (0, 7):
95-
assert spawner.user.server.ip == value
96-
else:
97-
assert spawner.ip == value
87+
assert spawner.ip == value
9888

9989

10090
def test_spawner_start_stop_poll(db, io_loop):

0 commit comments

Comments
 (0)