Skip to content

Commit c8a1554

Browse files
committed
Use 9091+ ports for tests and remove debug output
Turned out that port 9090 is occupied on TeamCity build agents and thus can't be used for boltkit tests. This commit makes tests use ports starting from 9091 and removes usages of port 13001. It also removes debug printouts used for test failures investigation.
1 parent 4305d7e commit c8a1554

File tree

3 files changed

+33
-40
lines changed

3 files changed

+33
-40
lines changed

test/resources/boltkit/routing_table_with_zero_ttl.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
C: RUN "CALL dbms.cluster.routing.getServers" {}
66
PULL_ALL
77
S: SUCCESS {"fields": ["ttl", "servers"]}
8-
RECORD [0, [{"addresses": ["127.0.0.1:13001","127.0.0.1:9091","127.0.0.1:9092","127.0.0.1:9999"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9999"], "role": "READ"},{"addresses": ["127.0.0.1:9999"], "role": "WRITE"}]]
8+
RECORD [0, [{"addresses": ["127.0.0.1:9091","127.0.0.1:9092","127.0.0.1:9093","127.0.0.1:9999"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9999"], "role": "READ"},{"addresses": ["127.0.0.1:9999"], "role": "WRITE"}]]
99
SUCCESS {}
1010
C: RUN "MATCH (n) RETURN n" {}
1111
PULL_ALL

test/v1/boltkit.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var fs = require('fs');
2323
var tmp = require('tmp');
2424

2525
var BoltKit = function (verbose) {
26-
this.verbose = verbose || true;
26+
this.verbose = verbose || false;
2727
};
2828

2929
BoltKit.prototype.startWithTemplate = function (scriptTemplate, parameters, port) {
@@ -37,17 +37,16 @@ BoltKit.prototype.startWithTemplate = function (scriptTemplate, parameters, port
3737
BoltKit.prototype.start = function(script, port) {
3838
var spawn = childProcess.spawn, server, code = -1;
3939

40-
console.log('+++ Starting boltstub on port ' + port);
4140
server = spawn('/usr/local/bin/boltstub', ['-v', port, script]);
4241
if (this.verbose) {
4342
server.stdout.on('data', (data) => {
44-
console.log(`+++ Boltstup on port ${port}:\n${data}`);
43+
console.log(`${data}`);
4544
});
4645
server.stderr.on('data', (data) => {
47-
console.log(`+++ Boltstup on port ${port}:\n${data}`);
46+
console.log(`${data}`);
4847
});
4948
server.on('end', function (data) {
50-
console.log(`+++ Boltstup on port ${port}:\n${data}`);
49+
console.log(data);
5150
});
5251
}
5352

@@ -56,7 +55,7 @@ BoltKit.prototype.start = function(script, port) {
5655
});
5756

5857
server.on('error', function (err) {
59-
console.log('Failed to start child process on port ' + port + ' error: ' + err);
58+
console.log('Failed to start child process:' + err);
6059
});
6160

6261
var Server = function(){};

test/v1/routing.driver.boltkit.it.js

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,12 @@ import neo4j from "../../src/v1";
2121
import boltkit from "./boltkit";
2222
import RoutingTable from "../../src/v1/internal/routing-table";
2323

24-
jasmine.getEnv().addReporter({
25-
specStarted: result => {
26-
console.log('+++ Running test: ' + result.fullName);
27-
}
28-
});
29-
3024
describe('routing driver', () => {
3125
let originalTimeout;
3226

3327
beforeAll(() => {
3428
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
35-
jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
29+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
3630
});
3731

3832
afterAll(() => {
@@ -660,9 +654,9 @@ describe('routing driver', () => {
660654

661655
const kit = new boltkit.BoltKit();
662656
const server1 = kit.start('./test/resources/boltkit/routing_table_with_zero_ttl.script', 9999);
663-
const server2 = kit.start('./test/resources/boltkit/no_writers.script', 13001);
664-
const server3 = kit.start('./test/resources/boltkit/no_writers.script', 9091);
665-
const server4 = kit.start('./test/resources/boltkit/no_writers.script', 9092);
657+
const server2 = kit.start('./test/resources/boltkit/no_writers.script', 9091);
658+
const server3 = kit.start('./test/resources/boltkit/no_writers.script', 9092);
659+
const server4 = kit.start('./test/resources/boltkit/no_writers.script', 9093);
666660

667661
kit.run(() => {
668662
const driver = newDriver('bolt+routing://127.0.0.1:9999');
@@ -672,7 +666,7 @@ describe('routing driver', () => {
672666
expect(result1.summary.server.address).toEqual('127.0.0.1:9999');
673667
session1.close();
674668

675-
assertHasRouters(driver, ['127.0.0.1:13001', '127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9999']);
669+
assertHasRouters(driver, ['127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9093', '127.0.0.1:9999']);
676670
const memorizingRoutingTable = setUpMemorizingRoutingTable(driver);
677671

678672
const session2 = driver.session();
@@ -860,15 +854,15 @@ describe('routing driver', () => {
860854
expect(result1.summary.server.address).toEqual('127.0.0.1:9999');
861855
session1.close();
862856

863-
assertHasRouters(driver, ['127.0.0.1:13001', '127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9999']);
857+
assertHasRouters(driver, ['127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9093', '127.0.0.1:9999']);
864858
const memorizingRoutingTable = setUpMemorizingRoutingTable(driver);
865859

866860
const session2 = driver.session();
867861
session2.run('MATCH (n) RETURN n').then(result2 => {
868862
expect(result2.summary.server.address).toEqual('127.0.0.1:9999');
869863
session2.close();
870864

871-
memorizingRoutingTable.assertForgotRouters(['127.0.0.1:13001', '127.0.0.1:9091', '127.0.0.1:9092']);
865+
memorizingRoutingTable.assertForgotRouters(['127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9093']);
872866
assertHasRouters(driver, ['127.0.0.1:9999']);
873867
driver.close();
874868

@@ -953,8 +947,8 @@ describe('routing driver', () => {
953947
it('should accept routing table with 1 router, 1 reader and 1 writer', done => {
954948
testRoutingTableAcceptance(
955949
{
956-
routers: ['127.0.0.1:13001'],
957-
readers: ['127.0.0.1:9091'],
950+
routers: ['127.0.0.1:9091'],
951+
readers: ['127.0.0.1:9092'],
958952
writers: ['127.0.0.1:9999']
959953
},
960954
9999, done);
@@ -963,8 +957,8 @@ describe('routing driver', () => {
963957
it('should accept routing table with 2 routers, 1 reader and 1 writer', done => {
964958
testRoutingTableAcceptance(
965959
{
966-
routers: ['127.0.0.1:13001', '127.0.0.1:9091'],
967-
readers: ['127.0.0.1:9091'],
960+
routers: ['127.0.0.1:9091', '127.0.0.1:9092'],
961+
readers: ['127.0.0.1:9092'],
968962
writers: ['127.0.0.1:9999']
969963
},
970964
9999, done);
@@ -973,8 +967,8 @@ describe('routing driver', () => {
973967
it('should accept routing table with 1 router, 2 readers and 1 writer', done => {
974968
testRoutingTableAcceptance(
975969
{
976-
routers: ['127.0.0.1:13001'],
977-
readers: ['127.0.0.1:9091', '127.0.0.1:9092'],
970+
routers: ['127.0.0.1:9091'],
971+
readers: ['127.0.0.1:9092', '127.0.0.1:9093'],
978972
writers: ['127.0.0.1:9999']
979973
},
980974
9999, done);
@@ -983,8 +977,8 @@ describe('routing driver', () => {
983977
it('should accept routing table with 2 routers, 2 readers and 1 writer', done => {
984978
testRoutingTableAcceptance(
985979
{
986-
routers: ['127.0.0.1:13001', '127.0.0.1:9091'],
987-
readers: ['127.0.0.1:9092', '127.0.0.1:9093'],
980+
routers: ['127.0.0.1:9091', '127.0.0.1:9092'],
981+
readers: ['127.0.0.1:9093', '127.0.0.1:9094'],
988982
writers: ['127.0.0.1:9999']
989983
},
990984
9999, done);
@@ -993,39 +987,39 @@ describe('routing driver', () => {
993987
it('should accept routing table with 1 router, 1 reader and 2 writers', done => {
994988
testRoutingTableAcceptance(
995989
{
996-
routers: ['127.0.0.1:13001'],
997-
readers: ['127.0.0.1:9091'],
998-
writers: ['127.0.0.1:9999', '127.0.0.1:9092']
990+
routers: ['127.0.0.1:9091'],
991+
readers: ['127.0.0.1:9092'],
992+
writers: ['127.0.0.1:9999', '127.0.0.1:9093']
999993
},
1000994
9999, done);
1001995
});
1002996

1003997
it('should accept routing table with 2 routers, 1 reader and 2 writers', done => {
1004998
testRoutingTableAcceptance(
1005999
{
1006-
routers: ['127.0.0.1:13001', '127.0.0.1:9091'],
1007-
readers: ['127.0.0.1:9092'],
1008-
writers: ['127.0.0.1:9999', '127.0.0.1:9093']
1000+
routers: ['127.0.0.1:9091', '127.0.0.1:9092'],
1001+
readers: ['127.0.0.1:9093'],
1002+
writers: ['127.0.0.1:9999', '127.0.0.1:9094']
10091003
},
10101004
9999, done);
10111005
});
10121006

10131007
it('should accept routing table with 1 router, 2 readers and 2 writers', done => {
10141008
testRoutingTableAcceptance(
10151009
{
1016-
routers: ['127.0.0.1:13001'],
1017-
readers: ['127.0.0.1:9091', '127.0.0.1:9092'],
1018-
writers: ['127.0.0.1:9999', '127.0.0.1:9093']
1010+
routers: ['127.0.0.1:9091'],
1011+
readers: ['127.0.0.1:9092', '127.0.0.1:9093'],
1012+
writers: ['127.0.0.1:9999', '127.0.0.1:9094']
10191013
},
10201014
9999, done);
10211015
});
10221016

10231017
it('should accept routing table with 2 routers, 2 readers and 2 writers', done => {
10241018
testRoutingTableAcceptance(
10251019
{
1026-
routers: ['127.0.0.1:13001', '127.0.0.1:9091'],
1027-
readers: ['127.0.0.1:9092', '127.0.0.1:9093'],
1028-
writers: ['127.0.0.1:9999', '127.0.0.1:9094']
1020+
routers: ['127.0.0.1:9091', '127.0.0.1:9092'],
1021+
readers: ['127.0.0.1:9093', '127.0.0.1:9094'],
1022+
writers: ['127.0.0.1:9999', '127.0.0.1:9095']
10291023
},
10301024
9999, done);
10311025
});

0 commit comments

Comments
 (0)