6
6
from traitlets import Unicode
7
7
import time
8
8
import pytest
9
- from jupyterhub import orm , version_info
9
+ from jupyterhub import orm
10
10
from tornado import gen
11
11
12
12
try :
@@ -61,25 +61,18 @@ def run_command(self, *args, **kwargs):
61
61
def new_spawner (db , spawner_class = BatchDummy , ** kwargs ):
62
62
kwargs .setdefault ("cmd" , ["singleuser_command" ])
63
63
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.
71
68
kwargs .setdefault ("hub" , hub )
72
69
kwargs .setdefault ("user" , user )
73
70
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
83
76
return spawner
84
77
85
78
@@ -91,10 +84,7 @@ def test_stress_submit(db, io_loop):
91
84
92
85
93
86
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
98
88
99
89
100
90
def test_spawner_start_stop_poll (db , io_loop ):
0 commit comments