##// END OF EJS Templates
Removing return value of restart_kernel....
Brian E. Granger -
Show More
@@ -364,9 +364,9 b' class KernelActionHandler(AuthenticatedHandler):'
364 km.interrupt_kernel(kernel_id)
364 km.interrupt_kernel(kernel_id)
365 self.set_status(204)
365 self.set_status(204)
366 if action == 'restart':
366 if action == 'restart':
367 new_kernel_id = km.restart_kernel(kernel_id)
367 km.restart_kernel(kernel_id)
368 data = {'ws_url':self.ws_url,'kernel_id':new_kernel_id}
368 data = {'ws_url':self.ws_url, 'kernel_id':kernel_id}
369 self.set_header('Location', '/'+new_kernel_id)
369 self.set_header('Location', '/'+kernel_id)
370 self.write(jsonapi.dumps(data))
370 self.write(jsonapi.dumps(data))
371 self.finish()
371 self.finish()
372
372
@@ -350,7 +350,6 b' class MappingKernelManager(MultiKernelManager):'
350 self._check_kernel_id(kernel_id)
350 self._check_kernel_id(kernel_id)
351 super(MappingKernelManager, self).restart_kernel(kernel_id)
351 super(MappingKernelManager, self).restart_kernel(kernel_id)
352 self.log.info("Kernel restarted: %s" % kernel_id)
352 self.log.info("Kernel restarted: %s" % kernel_id)
353 return kernel_id
354
353
355 def create_iopub_stream(self, kernel_id):
354 def create_iopub_stream(self, kernel_id):
356 """Create a new iopub stream."""
355 """Create a new iopub stream."""
@@ -12,8 +12,8 b' class TestKernelManager(TestCase):'
12 self.assertTrue(kid in km)
12 self.assertTrue(kid in km)
13 self.assertTrue(kid in km.list_kernel_ids())
13 self.assertTrue(kid in km.list_kernel_ids())
14 self.assertEqual(len(km),1)
14 self.assertEqual(len(km),1)
15 new_kid = km.restart_kernel(kid)
15 km.restart_kernel(kid)
16 self.assertTrue(kid, new_kid)
16 self.assertTrue(kid in km.list_kernel_ids())
17 km.interrupt_kernel(kid)
17 km.interrupt_kernel(kid)
18 km.kill_kernel(kid)
18 km.kill_kernel(kid)
19 self.assertTrue(not kid in km)
19 self.assertTrue(not kid in km)
General Comments 0
You need to be logged in to leave comments. Login now