Merge pull request ipython#7664 from minrk/start-busy

don't trigger kernel_starting after kernel_connected
jstenar · Feb 3, 2015 · 564bd97 · 564bd97
2 parents 7c34f17 + 13095ee
commit 564bd97
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/IPython/html/static/services/kernels/kernel.js b/IPython/html/static/services/kernels/kernel.js
@@ -180,6 +180,7 @@ define([
             url = url + "?" + qs;
         }
 
+        this.events.trigger('kernel_starting.Kernel', {kernel: this});
         var that = this;
         var on_success = function (data, status, xhr) {
             that.events.trigger('kernel_created.Kernel', {kernel: that});
@@ -402,7 +403,6 @@ define([
          * @function _kernel_connected
          */
         this.events.trigger('kernel_connected.Kernel', {kernel: this});
-        this.events.trigger('kernel_starting.Kernel', {kernel: this});
         // get kernel info so we know what state the kernel is in
         var that = this;
         this.kernel_info(function (reply) {

diff --git a/IPython/html/tests/services/kernel.js b/IPython/html/tests/services/kernel.js
@@ -163,9 +163,9 @@ casper.notebook_test(function () {
         'kill/start',
         [
             'kernel_killed.Kernel',
+            'kernel_starting.Kernel',
             'kernel_created.Kernel',
             'kernel_connected.Kernel',
-            'kernel_starting.Kernel',
             'kernel_ready.Kernel'
         ],
         function () {
@@ -205,7 +205,6 @@ casper.notebook_test(function () {
             'kernel_restarting.Kernel',
             'kernel_created.Kernel',
             'kernel_connected.Kernel',
-            'kernel_starting.Kernel',
             'kernel_ready.Kernel'
         ],
         function () {

diff --git a/IPython/html/tests/services/session.js b/IPython/html/tests/services/session.js
@@ -100,7 +100,6 @@ casper.notebook_test(function () {
         [
             'kernel_created.Session',
             'kernel_connected.Kernel',
-            'kernel_starting.Kernel',
             'kernel_ready.Kernel'
         ],
         function () {
@@ -129,7 +128,6 @@ casper.notebook_test(function () {
             'kernel_killed.Session',
             'kernel_created.Session',
             'kernel_connected.Kernel',
-            'kernel_starting.Kernel',
             'kernel_ready.Kernel'
         ],
         function () {