diff --git a/package.json b/package.json index 3a02361ffe..a70d161903 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { - "test": "mocha" + "test": "mocha test/websocket-test.js test/server-test.js test/*-test.{js,coffee}" }, "repository": { @@ -31,4 +31,4 @@ }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/mocha.opts b/test/mocha.opts index 340b324494..77a7a3544f 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -2,7 +2,4 @@ --compilers coffee:coffee-script --ui tdd --timeout 10000 ---slow 600 -test/websocket-test.js -test/server-test.js -test/*-test.{js,coffee} \ No newline at end of file +--slow 600 \ No newline at end of file diff --git a/test/new-path-test.coffee b/test/new-path-test.coffee index 25183c0d57..f2f2c94bee 100644 --- a/test/new-path-test.coffee +++ b/test/new-path-test.coffee @@ -318,11 +318,11 @@ create_path_test = (pth) -> one_message (m) -> sent = m error_info = (m, more) -> - info = + info = path_expected: pth, path_find_request: sent, path_find_updates: messages - + extend(info, more) if more? ledger.pretty_json(info) @@ -350,8 +350,10 @@ create_path_test = (pth) -> # TODO:hack: expand_alternative alt for alt in m.alternatives + messages[if updates then "update-#{updates}" else 'initial-response'] = m updates++ + # console.log updates assert m.alternatives.length >= max_seen, "Subsequent path_find update' should never have less " + @@ -359,10 +361,10 @@ create_path_test = (pth) -> max_seen = m.alternatives.length - if updates == 2 - testutils.ledger_close(self.remote, -> ) + # if updates == 2 + # testutils.ledger_close(self.remote, -> ) - if updates == 3 + if updates == 2 # "TODO: need to patch ripple-lib" # self.log_pre(self.server.get_logs(), "Server Logs") diff --git a/test/runall.sh b/test/runall.sh index 24fb30c8f9..e0a2a20cba 100755 --- a/test/runall.sh +++ b/test/runall.sh @@ -1,4 +1,4 @@ #!/bin/bash # flags set in mocha.opts -mocha \ No newline at end of file +mocha test/websocket-test.js test/server-test.js test/*-test.{js,coffee} \ No newline at end of file