Skip to content

Commit 7d3ed1a

Browse files
lutovichlutovich
committed
Do not use port 9000 for boltkit tests
This port is taken by something else on our build agents. Use 9999 instead.
1 parent 3aae3b8 commit 7d3ed1a

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎test/resources/boltkit/routing_table_with_zero_ttl.script‎

Lines changed: 2 additions & 2 deletions
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:9090","127.0.0.1:9091","127.0.0.1:9092","127.0.0.1:9000"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9000"], "role": "READ"},{"addresses": ["127.0.0.1:9000"], "role": "WRITE"}]]
8+
RECORD [0, [{"addresses": ["127.0.0.1:9090","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"}]]
99
SUCCESS {}
1010
C: RUN "MATCH (n) RETURN n" {}
1111
PULL_ALL
@@ -14,7 +14,7 @@ S: SUCCESS {"fields": ["n"]}
1414
C: RUN "CALL dbms.cluster.routing.getServers" {}
1515
PULL_ALL
1616
S: SUCCESS {"fields": ["ttl", "servers"]}
17-
RECORD [0, [{"addresses": ["127.0.0.1:9000"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9000"], "role": "READ"},{"addresses": ["127.0.0.1:9000"], "role": "WRITE"}]]
17+
RECORD [0, [{"addresses": ["127.0.0.1:9999"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9999"], "role": "READ"},{"addresses": ["127.0.0.1:9999"], "role": "WRITE"}]]
1818
SUCCESS {}
1919
C: RUN "MATCH (n) RETURN n" {}
2020
PULL_ALL

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ describe('routing driver', () => {
196196
}
197197
// Given
198198
const kit = new boltkit.BoltKit();
199-
const seedServer = kit.start('./test/resources/boltkit/short_ttl.script', 9000);
199+
const seedServer = kit.start('./test/resources/boltkit/short_ttl.script', 9999);
200200
const nextRouter = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9003);
201201
const readServer1 = kit.start('./test/resources/boltkit/read_server.script', 9004);
202202
const readServer2 = kit.start('./test/resources/boltkit/read_server.script', 9005);
203203

204204
kit.run(() => {
205-
const driver = newDriver("bolt+routing://127.0.0.1:9000");
205+
const driver = newDriver("bolt+routing://127.0.0.1:9999");
206206
// When
207207
const session1 = driver.session(neo4j.session.READ);
208208
session1.run("MATCH (n) RETURN n.name").then(res => {
@@ -653,29 +653,29 @@ describe('routing driver', () => {
653653
}
654654

655655
const kit = new boltkit.BoltKit();
656-
const server1 = kit.start('./test/resources/boltkit/routing_table_with_zero_ttl.script', 9000);
656+
const server1 = kit.start('./test/resources/boltkit/routing_table_with_zero_ttl.script', 9999);
657657
const server2 = kit.start('./test/resources/boltkit/no_writers.script', 9090);
658658
const server3 = kit.start('./test/resources/boltkit/no_writers.script', 9091);
659659
const server4 = kit.start('./test/resources/boltkit/no_writers.script', 9092);
660660

661661
kit.run(() => {
662-
const driver = newDriver('bolt+routing://127.0.0.1:9000');
662+
const driver = newDriver('bolt+routing://127.0.0.1:9999');
663663

664664
const session1 = driver.session();
665665
session1.run('MATCH (n) RETURN n').then(result1 => {
666-
expect(result1.summary.server.address).toEqual('127.0.0.1:9000');
666+
expect(result1.summary.server.address).toEqual('127.0.0.1:9999');
667667
session1.close();
668668

669-
assertHasRouters(driver, ['127.0.0.1:9090', '127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9000']);
669+
assertHasRouters(driver, ['127.0.0.1:9090', '127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9999']);
670670
const memorizingRoutingTable = setUpMemorizingRoutingTable(driver);
671671

672672
const session2 = driver.session();
673673
session2.run('MATCH (n) RETURN n').then(result2 => {
674-
expect(result2.summary.server.address).toEqual('127.0.0.1:9000');
674+
expect(result2.summary.server.address).toEqual('127.0.0.1:9999');
675675
session2.close();
676676

677677
memorizingRoutingTable.assertForgotRouters([]);
678-
assertHasRouters(driver, ['127.0.0.1:9000']);
678+
assertHasRouters(driver, ['127.0.0.1:9999']);
679679
driver.close();
680680

681681
server1.exit(code1 => {
@@ -844,26 +844,26 @@ describe('routing driver', () => {
844844
}
845845

846846
const kit = new boltkit.BoltKit();
847-
const server = kit.start('./test/resources/boltkit/routing_table_with_zero_ttl.script', 9000);
847+
const server = kit.start('./test/resources/boltkit/routing_table_with_zero_ttl.script', 9999);
848848

849849
kit.run(() => {
850-
const driver = newDriver('bolt+routing://127.0.0.1:9000');
850+
const driver = newDriver('bolt+routing://127.0.0.1:9999');
851851

852852
const session1 = driver.session();
853853
session1.run('MATCH (n) RETURN n').then(result1 => {
854-
expect(result1.summary.server.address).toEqual('127.0.0.1:9000');
854+
expect(result1.summary.server.address).toEqual('127.0.0.1:9999');
855855
session1.close();
856856

857-
assertHasRouters(driver, ['127.0.0.1:9090', '127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9000']);
857+
assertHasRouters(driver, ['127.0.0.1:9090', '127.0.0.1:9091', '127.0.0.1:9092', '127.0.0.1:9999']);
858858
const memorizingRoutingTable = setUpMemorizingRoutingTable(driver);
859859

860860
const session2 = driver.session();
861861
session2.run('MATCH (n) RETURN n').then(result2 => {
862-
expect(result2.summary.server.address).toEqual('127.0.0.1:9000');
862+
expect(result2.summary.server.address).toEqual('127.0.0.1:9999');
863863
session2.close();
864864

865865
memorizingRoutingTable.assertForgotRouters(['127.0.0.1:9090', '127.0.0.1:9091', '127.0.0.1:9092']);
866-
assertHasRouters(driver, ['127.0.0.1:9000']);
866+
assertHasRouters(driver, ['127.0.0.1:9999']);
867867
driver.close();
868868

869869
server.exit(code1 => {
@@ -949,79 +949,79 @@ describe('routing driver', () => {
949949
{
950950
routers: ['127.0.0.1:9090'],
951951
readers: ['127.0.0.1:9091'],
952-
writers: ['127.0.0.1:9000']
952+
writers: ['127.0.0.1:9999']
953953
},
954-
9000, done);
954+
9999, done);
955955
});
956956

957957
it('should accept routing table with 2 routers, 1 reader and 1 writer', done => {
958958
testRoutingTableAcceptance(
959959
{
960960
routers: ['127.0.0.1:9090', '127.0.0.1:9091'],
961961
readers: ['127.0.0.1:9091'],
962-
writers: ['127.0.0.1:9000']
962+
writers: ['127.0.0.1:9999']
963963
},
964-
9000, done);
964+
9999, done);
965965
});
966966

967967
it('should accept routing table with 1 router, 2 readers and 1 writer', done => {
968968
testRoutingTableAcceptance(
969969
{
970970
routers: ['127.0.0.1:9090'],
971971
readers: ['127.0.0.1:9091', '127.0.0.1:9092'],
972-
writers: ['127.0.0.1:9000']
972+
writers: ['127.0.0.1:9999']
973973
},
974-
9000, done);
974+
9999, done);
975975
});
976976

977977
it('should accept routing table with 2 routers, 2 readers and 1 writer', done => {
978978
testRoutingTableAcceptance(
979979
{
980980
routers: ['127.0.0.1:9090', '127.0.0.1:9091'],
981981
readers: ['127.0.0.1:9092', '127.0.0.1:9093'],
982-
writers: ['127.0.0.1:9000']
982+
writers: ['127.0.0.1:9999']
983983
},
984-
9000, done);
984+
9999, done);
985985
});
986986

987987
it('should accept routing table with 1 router, 1 reader and 2 writers', done => {
988988
testRoutingTableAcceptance(
989989
{
990990
routers: ['127.0.0.1:9090'],
991991
readers: ['127.0.0.1:9091'],
992-
writers: ['127.0.0.1:9000', '127.0.0.1:9092']
992+
writers: ['127.0.0.1:9999', '127.0.0.1:9092']
993993
},
994-
9000, done);
994+
9999, done);
995995
});
996996

997997
it('should accept routing table with 2 routers, 1 reader and 2 writers', done => {
998998
testRoutingTableAcceptance(
999999
{
10001000
routers: ['127.0.0.1:9090', '127.0.0.1:9091'],
10011001
readers: ['127.0.0.1:9092'],
1002-
writers: ['127.0.0.1:9000', '127.0.0.1:9093']
1002+
writers: ['127.0.0.1:9999', '127.0.0.1:9093']
10031003
},
1004-
9000, done);
1004+
9999, done);
10051005
});
10061006

10071007
it('should accept routing table with 1 router, 2 readers and 2 writers', done => {
10081008
testRoutingTableAcceptance(
10091009
{
10101010
routers: ['127.0.0.1:9090'],
10111011
readers: ['127.0.0.1:9091', '127.0.0.1:9092'],
1012-
writers: ['127.0.0.1:9000', '127.0.0.1:9093']
1012+
writers: ['127.0.0.1:9999', '127.0.0.1:9093']
10131013
},
1014-
9000, done);
1014+
9999, done);
10151015
});
10161016

10171017
it('should accept routing table with 2 routers, 2 readers and 2 writers', done => {
10181018
testRoutingTableAcceptance(
10191019
{
10201020
routers: ['127.0.0.1:9090', '127.0.0.1:9091'],
10211021
readers: ['127.0.0.1:9092', '127.0.0.1:9093'],
1022-
writers: ['127.0.0.1:9000', '127.0.0.1:9094']
1022+
writers: ['127.0.0.1:9999', '127.0.0.1:9094']
10231023
},
1024-
9000, done);
1024+
9999, done);
10251025
});
10261026

10271027
function testForProtocolError(scriptFile, done) {

0 commit comments

Comments
 (0)