Repository: incubator-ignite Updated Branches: refs/heads/nodejs 8aeb5f05c -> be9f16b02
#nodejs: add test_ignition_fail.js Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be9f16b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be9f16b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be9f16b0 Branch: refs/heads/nodejs Commit: be9f16b020fe8d8a7886bfc7d989b50ead1bc524 Parents: 8aeb5f0 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jun 5 18:43:03 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jun 5 18:43:03 2015 +0300 ---------------------------------------------------------------------- modules/nodejs/src/main/nodejs/ignition.js | 2 +- .../apache/ignite/internal/NodeJsAbstractTest.java | 2 +- .../org/apache/ignite/internal/NodeJsSelfTest.java | 7 +++++++ .../nodejs/src/test/nodejs/test_ignition_fail.js | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be9f16b0/modules/nodejs/src/main/nodejs/ignition.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/main/nodejs/ignition.js b/modules/nodejs/src/main/nodejs/ignition.js index 1d8aa46..5e36da2 100644 --- a/modules/nodejs/src/main/nodejs/ignition.js +++ b/modules/nodejs/src/main/nodejs/ignition.js @@ -42,7 +42,7 @@ Ignition.start = function(port, hosts, callback) { console.log(error); if (!numConn) - callback.call(null, "Cannot connect to servers", null); + callback.call(null, "Cannot connect to servers.", null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be9f16b0/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java index ba04f53..9037c6a 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsAbstractTest.java @@ -117,7 +117,7 @@ public class NodeJsAbstractTest extends GridCommonAbstractTest { if (s.contains(SCRIPT_FINISHED)) readyLatch.countDown(); - if (s.contains("error") || s.contains("fail") || s.contains(SCRIPT_FAILED)) { + if (/*s.contains("error") || s.contains("fail") || */s.contains(SCRIPT_FAILED)) { errors.add("Script failed: " + s); readyLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be9f16b0/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java index 2821e3e..66e973d 100644 --- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java +++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java @@ -37,4 +37,11 @@ public class NodeJsSelfTest extends NodeJsAbstractTest { public void testIgnitionStart() throws Exception { runJsScript(getNodeJsTestDir() + "test_ignition.js"); } + + /** + * @throws Exception If failed. + */ + public void testIgnitionFailedStart() throws Exception { + runJsScript(getNodeJsTestDir() + "test_ignition_fail.js"); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be9f16b0/modules/nodejs/src/test/nodejs/test_ignition_fail.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/nodejs/test_ignition_fail.js b/modules/nodejs/src/test/nodejs/test_ignition_fail.js new file mode 100644 index 0000000..e50d08f --- /dev/null +++ b/modules/nodejs/src/test/nodejs/test_ignition_fail.js @@ -0,0 +1,17 @@ +var TestUtils = require("./test_utils").TestUtils; +var Ignition = require(TestUtils.scriptPath() + "ignition").Ignition; + +Ignition.start(9091, ['127.0.0.0', '127.0.0.1'], onConnect); + +function onConnect(error, server) { + if (error) { + if (error.indexOf("Cannot connect to servers.") == -1) + TestUtils.testFails("Incorrect error message: " + error); + else + TestUtils.testDone(); + + return; + } + + TestUtils.testFails("Test should fail."); +} \ No newline at end of file
