Merge branch 'pr139_update' into singleuserapp_and_1.0

Author: rkdarst

batchspawner/batchspawner.py

@@ -372,6 +372,10 @@ def start(self):
         self.ip = self.state_gethost()
         while self.port == 0:
             yield gen.sleep(self.startup_poll_interval)
+            # Test framework: For testing, mock_port is set because we
+            # don't actually run the single-user server yet.
+            if hasattr(self, 'mock_port'):
+                self.port = self.mock_port
 
         if jupyterhub.version_info < (0,7):
             # store on user for pre-jupyterhub-0.7:

batchspawner/tests/test_spawners.py

@@ -64,7 +64,7 @@ def new_spawner(db, spawner_class=BatchDummy, **kwargs):
         kwargs.setdefault('server', server)
     kwargs.setdefault('hub', hub)
     kwargs.setdefault('user', user)
-    kwargs.setdefault('current_port', testport)
+    kwargs.setdefault('mock_port', testport)
     kwargs.setdefault('INTERRUPT_TIMEOUT', 1)
     kwargs.setdefault('TERM_TIMEOUT', 1)
     kwargs.setdefault('KILL_TIMEOUT', 1)
@@ -84,7 +84,7 @@ def check_ip(spawner, value):
     if version_info < (0,7):
         assert spawner.user.server.ip == value
     else:
-        assert spawner.current_ip == value
+        assert spawner.ip == value
 
 def test_spawner_start_stop_poll(db, io_loop):
     spawner = new_spawner(db=db)