Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit bc93384

Browse files
committed
Temporarily isolate scala system tests.
(c) Copyright IBM Corp. 2016
1 parent 3a4ace7 commit bc93384

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,9 @@ docs: .watch-docs dist/docs
366366
all: BASEURL?=http://192.168.99.100:9500
367367
all: BROWSER_LIST?=chrome
368368
all: init
369-
$(MAKE) test-js-remote
370-
$(MAKE) test-py
371-
PYTHON=python2 $(MAKE) test-py
372-
$(MAKE) test-scala
373369
$(MAKE) sdist
374370
$(MAKE) install
375-
PYTHON=python2 $(MAKE) install
376371
@BASEURL=$(BASEURL) BROWSER_LIST="$(BROWSER_LIST)" $(MAKE) system-test
377-
@BASEURL=$(BASEURL) BROWSER_LIST="$(BROWSER_LIST)" PYTHON=python2 $(MAKE) system-test
378-
$(MAKE) dist/docs
379372

380373
release: EXTRA_OPTIONS=-e PYPI_USER=$(PYPI_USER) -e PYPI_PASSWORD=$(PYPI_PASSWORD)
381374
release: PRE_SDIST=echo "[server-login]" > ~/.pypirc; echo "username:" ${PYPI_USER} >> ~/.pypirc; echo "password:" ${PYPI_PASSWORD} >> ~/.pypirc;

elements/urth-core-behaviors/jupyter-widget-behavior.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@
5252
widget_class: this.kernelClass
5353
}
5454
).then(function(model) {
55+
//This check is to protect against a timing in ipywidgets where the comm can be close
56+
//by the time it gets to resolve this promise
57+
if(!model.comm.kernel.comm_manager.comms[model.comm.comm_id]){
58+
this._handleCommDisconnect();
59+
return;
60+
}
61+
5562
console.log('Model creation successful!', model);
5663
this.__modelChangeCallback = this._onModelChange.bind(this);
5764
this.__commCloseCallback = this._handleCommDisconnect.bind(this);

etc/notebooks/tests/Walkthrough-Scala.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@
413413
],
414414
"metadata": {
415415
"kernelspec": {
416-
"display_name": "Apache Toree (Scala 2.10.4)",
417-
"language": "scala",
418-
"name": "scala"
416+
"display_name": "Apache_Toree",
417+
"language": "",
418+
"name": "apache_toree"
419419
},
420420
"language_info": {
421421
"name": "scala"

system-test/urth-core-bind-specs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var wd = require('wd');
55
var Boilerplate = require('./utils/boilerplate');
66
var boilerplate = new Boilerplate();
77

8-
describe('Urth Core Bind', function() {
8+
false && describe('Urth Core Bind', function() {
99

1010
boilerplate.setup(this.title, '/notebooks/tests/urth-core-bind.ipynb', 3);
1111

system-test/urth-r-widgets-specs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var wd = require('wd');
55
var Boilerplate = require('./utils/boilerplate');
66
var boilerplate = new Boilerplate();
77

8-
process.env.PYTHON != "python2" && describe('Widgets R System Test', function() {
8+
false && process.env.PYTHON != "python2" && describe('Widgets R System Test', function() {
99
boilerplate.setup(this.title, '/notebooks/tests/urth-r-widgets.ipynb', 7);
1010

1111
it('should print the result of a Function Widget invocation', function(done) {

system-test/urth-system-test-specs.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var wd = require('wd');
55
var Boilerplate = require('./utils/boilerplate');
66
var boilerplate = new Boilerplate();
77

8-
describe('Widgets Python System Test', function() {
8+
false && describe('Widgets Python System Test', function() {
99
boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb', 8);
1010

1111
it('should print the correct variable that is used for urth-core-function', function(done) {
@@ -87,7 +87,6 @@ process.env.PYTHON != "python2" && describe('Widgets Scala System Test', functio
8787
it('should print the correct variable that is used for urth-core-function', function(done) {
8888

8989
boilerplate.browser
90-
.elementsByCssSelector('div.code_cell').nth(5)
9190
.elementByXPath('//button[text()="invoke"]').click()
9291
.waitForElementById('test1', wd.asserters.textInclude('world'), timeout)
9392
.nodeify(done);

system-test/urth-viz-table-specs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var chai = require('chai');
66
var Boilerplate = require('./utils/boilerplate');
77
var boilerplate = new Boilerplate();
88

9-
describe('Urth Viz Table Test', function() {
9+
false && describe('Urth Viz Table Test', function() {
1010

1111
var tagChaiAssertionError = function(err) {
1212
// throw error and tag as retriable to poll again

0 commit comments

Comments
 (0)