Handle and test for failed restart in session.js

IPython/html/static/services/sessions/js/session.js

@@ -57,6 +57,11 @@ define([
         this.events.on('kernel_created.Session', record_status);
         this.events.on('kernel_dead.Session', record_status);
         this.events.on('status_killed.Session', record_status);
+
+        // if the kernel dies, then also remove the session
+        this.events.on('kernel_dead.Kernel', function () {
+            that.delete();
+        });
     };
 
 

IPython/html/tests/services/session.js

@@ -140,6 +140,32 @@ casper.notebook_test(function () {
     );
     this.wait_for_kernel_ready();
 
+    // test handling of failed restart
+    this.event_test(
+        'failed_restart',
+        [
+            'status_restarting.Kernel',
+            'status_autorestarting.Kernel',
+            'status_killed.Session',
+            'kernel_dead.Kernel',
+        ],
+        function () {
+            this.thenEvaluate(function () {
+                var cell = IPython.notebook.get_cell(0);
+                cell.set_text("import os\n" +
+                              "from IPython.kernel.connect import get_connection_file\n" +
+                              "with open(get_connection_file(), 'w') as f:\n" +
+                              "    f.write('garbage')\n" +
+                              "os._exit(1)");
+                cell.execute();
+            });
+        },
+
+        // need an extra-long timeout, because it needs to try
+        // restarting the kernel 5 times!
+        20000
+    );
+
     // check for events when starting a nonexistant kernel
     this.event_test(
         'bad_start_session',