Add test for kernel_dead.Session

IPython/html/static/notebook/js/notificationarea.js

@@ -189,7 +189,7 @@ define([
             });
         });
 
-        this.events.on('kernel_dead.Kernel status_killed.Kernel kernel_dead.Session status_killed.Session', function () {
+        this.events.on('kernel_dead.Kernel status_killed.Kernel status_killed.Session', function () {
             that.save_widget.update_document_title();
             knw.danger("Dead kernel");
             $kernel_ind_icon.attr('class','kernel_dead_icon').attr('title','Kernel Dead');
@@ -219,10 +219,10 @@ define([
             });
         });
 
-        this.events.on('kernel_dead.Session',function (session, xhr, status, error) {
-            var full = status.responseJSON.message;
-            var short = status.responseJSON.short_message || 'Kernel error';
-            var traceback = status.responseJSON.traceback;
+        this.events.on('kernel_dead.Session', function (evt, info) {
+            var full = info.xhr.responseJSON.message;
+            var short = info.xhr.responseJSON.short_message || 'Kernel error';
+            var traceback = info.xhr.responseJSON.traceback;
 
             var showMsg = function () {
                 var msg = $('<div/>').append($('<p/>').text(full));

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

@@ -105,7 +105,7 @@ define([
             }
         };
         var on_error = function (xhr, status, err) {
-            that.events.trigger('kernel_dead.Session', {session: that});
+            that.events.trigger('kernel_dead.Session', {session: that, xhr: xhr, status: status, error: err});
             if (error) {
                 error(xhr, status, err);
             }

IPython/html/tests/services/session.js

@@ -154,4 +154,18 @@ casper.notebook_test(function () {
         }
     );
     this.wait(500);
+
+    // check for events when starting a nonexistant kernel
+    this.event_test(
+        'bad_start_session',
+        [
+            'status_killed.Session',
+            'kernel_dead.Session'
+        ],
+        function () {
+            this.thenEvaluate(function () {
+                IPython.notebook.session.restart({kernel_name: 'foo'});
+            });
+        }
+    );
 });

IPython/html/tests/util.js

@@ -606,7 +606,6 @@ casper.event_test = function (name, events, action) {
             return Object.keys(IPython._event_handlers);
         });
         this.test.assertEquals(triggered.length, events.length, name + ': ' + events.length + ' events were triggered');
-        this.echo(handlers);
         this.test.assertEquals(handlers.length, 0, name + ': all handlers triggered');
         for (var i=0; i < events.length; i++) {
             this.test.assertEquals(triggered[i], events[i], name + ': ' + events[i] + ' was triggered');