From 98101f9c6c668abc63dfb66256289c9c5f0c2507 Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Wed, 22 Jan 2014 09:00:22 +0100 Subject: [PATCH 1/5] add js kernel_info request --- .../html/static/services/kernels/js/kernel.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js index c1badfbda..eac2b984f 100644 --- a/IPython/html/static/services/kernels/js/kernel.js +++ b/IPython/html/static/services/kernels/js/kernel.js @@ -242,6 +242,24 @@ var IPython = (function (IPython) { return msg.header.msg_id; }; + /** + * Get kernel info + * + * @param callback {function} + * @method object_info + * + * When calling this method, pass a callback function that expects one argument. + * The callback will be passed the complete `kernel_info_reply` message documented + * [here](http://ipython.org/ipython-doc/dev/development/messaging.html#kernel-info) + */ + Kernel.prototype.kernel_info = function (callback) { + var callbacks; + if (callback) { + callbacks = { shell : { reply : callback } }; + } + return this.send_shell_message("kernel_info_request", {}, callbacks); + }; + /** * Get info on an object * From 4ecf5c8e5b348d5127819e3302ce4ad0e190d69a Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Thu, 23 Jan 2014 19:08:56 +0100 Subject: [PATCH 2/5] add kernel test --- .../casperjs/test_cases/kerneljs_test.js | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 IPython/html/tests/casperjs/test_cases/kerneljs_test.js diff --git a/IPython/html/tests/casperjs/test_cases/kerneljs_test.js b/IPython/html/tests/casperjs/test_cases/kerneljs_test.js new file mode 100644 index 000000000..0ee63ad76 --- /dev/null +++ b/IPython/html/tests/casperjs/test_cases/kerneljs_test.js @@ -0,0 +1,29 @@ + +// +// Miscellaneous javascript tests +// +casper.notebook_test(function () { + this.evaluate(function () { + IPython.notebook.kernel.kernel_info( + function(msg){ + IPyton._kernel_info_response = msg; + }) + }); + + this.waitFor( + function () { + return this.evaluate(function(){ + return IPython._kernel_info_response; + }); + }); + + this.then( + function () { + var kernel_info_response= this.evaluate(function(){ + return IPython._kernel_info_response; + }); + this.test.assertTrue( kernel_info_response.msg_type === 'kernel_info_reply', 'Kernel info request return kernel_info_reply'); + this.test.assertTrue( kernel_info_response.content !== undefined, 'Kernel_info_reply is not undefined'); + ); + +}); From 03a2cb653550cd6d56f91eac8203a2f65cf31c09 Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Thu, 23 Jan 2014 19:31:35 +0100 Subject: [PATCH 3/5] fix js formatting --- IPython/html/tests/casperjs/test_cases/kerneljs_test.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/IPython/html/tests/casperjs/test_cases/kerneljs_test.js b/IPython/html/tests/casperjs/test_cases/kerneljs_test.js index 0ee63ad76..77694a815 100644 --- a/IPython/html/tests/casperjs/test_cases/kerneljs_test.js +++ b/IPython/html/tests/casperjs/test_cases/kerneljs_test.js @@ -17,13 +17,12 @@ casper.notebook_test(function () { }); }); - this.then( - function () { - var kernel_info_response= this.evaluate(function(){ - return IPython._kernel_info_response; + this.then(function () { + var kernel_info_response= this.evaluate(function(){ + return IPython._kernel_info_response; }); this.test.assertTrue( kernel_info_response.msg_type === 'kernel_info_reply', 'Kernel info request return kernel_info_reply'); this.test.assertTrue( kernel_info_response.content !== undefined, 'Kernel_info_reply is not undefined'); - ); + }); }); From 25e68b3a75fbc9dbc16cf36f331ca7d8ab7f766e Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Thu, 23 Jan 2014 19:58:09 +0100 Subject: [PATCH 4/5] typo --- IPython/html/tests/casperjs/test_cases/kerneljs_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/html/tests/casperjs/test_cases/kerneljs_test.js b/IPython/html/tests/casperjs/test_cases/kerneljs_test.js index 77694a815..bcbda9e22 100644 --- a/IPython/html/tests/casperjs/test_cases/kerneljs_test.js +++ b/IPython/html/tests/casperjs/test_cases/kerneljs_test.js @@ -6,7 +6,7 @@ casper.notebook_test(function () { this.evaluate(function () { IPython.notebook.kernel.kernel_info( function(msg){ - IPyton._kernel_info_response = msg; + IPython._kernel_info_response = msg; }) }); @@ -18,7 +18,7 @@ casper.notebook_test(function () { }); this.then(function () { - var kernel_info_response= this.evaluate(function(){ + var kernel_info_response = this.evaluate(function(){ return IPython._kernel_info_response; }); this.test.assertTrue( kernel_info_response.msg_type === 'kernel_info_reply', 'Kernel info request return kernel_info_reply'); From e99756c6d5d981d810a1f1059f3cb3007984388f Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Fri, 24 Jan 2014 20:52:06 +0100 Subject: [PATCH 5/5] mv kerneljs_test to kernel_test --- .../casperjs/test_cases/{kerneljs_test.js => kernel_test.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename IPython/html/tests/casperjs/test_cases/{kerneljs_test.js => kernel_test.js} (100%) diff --git a/IPython/html/tests/casperjs/test_cases/kerneljs_test.js b/IPython/html/tests/casperjs/test_cases/kernel_test.js similarity index 100% rename from IPython/html/tests/casperjs/test_cases/kerneljs_test.js rename to IPython/html/tests/casperjs/test_cases/kernel_test.js