Fix boltkit tests

lutovich · lutovich · commit 801d5e8a87a6 · 2018-11-01T14:43:44.000+01:00
Most routing driver tests got broken after boltkit upgrade.
New version always returns server version 9.99.999 which tells driver
to use `getRoutingTable` procedure instead of `getServers` for
discovery.

Added test with explicit server version to test `getServers`.
diff --git a/test/resources/boltstub/acquire_endpoints.script b/test/resources/boltstub/acquire_endpoints.script
@@ -2,8 +2,8 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
-   SUCCESS {}
+   SUCCESS {}
diff --git a/test/resources/boltstub/acquire_endpoints_and_exit.script b/test/resources/boltstub/acquire_endpoints_and_exit.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/acquire_endpoints_old_routing_procedure.script b/test/resources/boltstub/acquire_endpoints_old_routing_procedure.script
@@ -0,0 +1,10 @@
+!: AUTO RESET
+!: AUTO PULL_ALL
+
+C: INIT "neo4j-javascript/0.0.0-dev" {"credentials": "password", "scheme": "basic", "principal": "neo4j"}
+S: SUCCESS {"server": "Neo4j/3.1.0"}
+C: RUN "CALL dbms.cluster.routing.getServers" {}
+   PULL_ALL
+S: SUCCESS {"fields": ["ttl", "servers"]}
+   RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
+   SUCCESS {}
diff --git a/test/resources/boltstub/acquire_endpoints_with_one_of_each.script b/test/resources/boltstub/acquire_endpoints_with_one_of_each.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/dead_routing_server.script b/test/resources/boltstub/dead_routing_server.script
@@ -2,6 +2,6 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
 C: PULL_ALL
 S: <EXIT>
diff --git a/test/resources/boltstub/discover_ipv6_servers_and_read.script b/test/resources/boltstub/discover_ipv6_servers_and_read.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "[::1]:9001"],"role": "READ"}, {"addresses": ["[2001:db8:a0b:12f0::1]:9002","[3731:54:65fe:2::a7]:9003"], "role": "WRITE"},{"addresses": ["[ff02::1]:9001","[684D:1111:222:3333:4444:5555:6:77]:9002","[::1]:9003"], "role": "ROUTE"}]]
@@ -11,4 +11,3 @@ C: RUN "MATCH (n) RETURN n.name" {}
    PULL_ALL
 S: SUCCESS {"fields": ["n.name"]}
    SUCCESS {}
-
diff --git a/test/resources/boltstub/discover_new_servers.script b/test/resources/boltstub/discover_new_servers.script
@@ -2,12 +2,12 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9004","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
    SUCCESS {}
 C: RUN "MATCH (n) RETURN n.name" {}
    PULL_ALL
 S: SUCCESS {"fields": ["n.name"]}
-   SUCCESS {}
+   SUCCESS {}
diff --git a/test/resources/boltstub/discover_no_writers.script b/test/resources/boltstub/discover_no_writers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": [],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9004","127.0.0.1:9005"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/discover_one_router.script b/test/resources/boltstub/discover_one_router.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9003","127.0.0.1:9004"], "role": "READ"},{"addresses": ["127.0.0.1:9005"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/discover_servers.script b/test/resources/boltstub/discover_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9009"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/discover_servers_and_read.script b/test/resources/boltstub/discover_servers_and_read.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
@@ -11,4 +11,3 @@ C: RUN "MATCH (n) RETURN n.name" {}
    PULL_ALL
 S: SUCCESS {"fields": ["n.name"]}
    SUCCESS {}
-
diff --git a/test/resources/boltstub/empty_get_servers_response.script b/test/resources/boltstub/empty_get_servers_response.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
-   SUCCESS {}
+   SUCCESS {}
diff --git a/test/resources/boltstub/multiple_records_get_servers.script b/test/resources/boltstub/multiple_records_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/no_readers_get_servers.script b/test/resources/boltstub/no_readers_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/no_routers_get_servers.script b/test/resources/boltstub/no_routers_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"},{"addresses": ["127.0.0.1:9001"], "role": "READ"}]]
diff --git a/test/resources/boltstub/no_servers_entry_get_servers.script b/test/resources/boltstub/no_servers_entry_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "notServers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/no_ttl_entry_get_servers.script b/test/resources/boltstub/no_ttl_entry_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["notTtl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/no_writers.script b/test/resources/boltstub/no_writers.script
@@ -2,8 +2,8 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": [],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
-   SUCCESS {}
+   SUCCESS {}
diff --git a/test/resources/boltstub/non_discovery.script b/test/resources/boltstub/non_discovery.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
 C: PULL_ALL
 S: FAILURE {"code": "Neo.ClientError.Procedure.ProcedureNotFound", "message": "blabla"}
 S: IGNORED
diff --git a/test/resources/boltstub/one_of_each_template.script.mst b/test/resources/boltstub/one_of_each_template.script.mst
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": {{{writers}}},"role": "WRITE"}, {"addresses": {{{readers}}}, "role": "READ"},{"addresses": {{{routers}}}, "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/rediscover.script b/test/resources/boltstub/rediscover.script
@@ -2,12 +2,12 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"], "role": "ROUTE"}]]
    SUCCESS {}
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9004"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005"], "role": "READ"},{"addresses": ["127.0.0.1:9002","127.0.0.1:9003","127.0.0.1:9004"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/rediscover_using_initial_router.script b/test/resources/boltstub/rediscover_using_initial_router.script
@@ -5,7 +5,7 @@
 !: AUTO RUN "COMMIT" {}
 !: AUTO RUN "ROLLBACK" {}
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001","127.0.0.1:9009","127.0.0.1:9010"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9011"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/routing_table_with_zero_ttl.script b/test/resources/boltstub/routing_table_with_zero_ttl.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    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"}]]
@@ -11,7 +11,7 @@ C: RUN "MATCH (n) RETURN n" {}
    PULL_ALL
 S: SUCCESS {"fields": ["n"]}
    SUCCESS {}
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    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"}]]
diff --git a/test/resources/boltstub/short_ttl.script b/test/resources/boltstub/short_ttl.script
@@ -2,8 +2,8 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [0, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9004"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
-   SUCCESS {}
+   SUCCESS {}
diff --git a/test/resources/boltstub/single_write_server.script b/test/resources/boltstub/single_write_server.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9004","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/unparsable_servers_get_servers.script b/test/resources/boltstub/unparsable_servers_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"notAddresses": ["127.0.0.1:9001"],"memberRole": "WRITER"}, {"notAddresses": ["127.0.0.1:9002","127.0.0.1:9003"], "memberRole": "READER"},{"notAddresses": ["127.0.0.1:9001","127.0.0.1:9002"], "memberRole": "ROUTER"}]]
diff --git a/test/resources/boltstub/unparsable_ttl_get_servers.script b/test/resources/boltstub/unparsable_ttl_get_servers.script
@@ -2,7 +2,7 @@
 !: AUTO RESET
 !: AUTO PULL_ALL
 
-C: RUN "CALL dbms.cluster.routing.getServers" {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [{ttl: 9223372036854775807}, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/v1/routing.driver.boltkit.test.js b/test/v1/routing.driver.boltkit.test.js
@@ -1915,6 +1915,34 @@ describe('routing driver with stub server', () => {
     testAddressPurgeOnDatabaseError(`RETURN 1`, READ, done);
   });
 
+  it('should rediscover using older getServers procedure when server is old', done => {
+    if (!boltStub.supported) {
+      done();
+      return;
+    }
+
+    const router = boltStub.start('./test/resources/boltstub/acquire_endpoints_old_routing_procedure.script', 9001);
+    const reader = boltStub.start('./test/resources/boltstub/read_server.script', 9005);
+
+    boltStub.run(() => {
+      const driver = boltStub.newDriver('bolt+routing://127.0.0.1:9001');
+
+      const session = driver.session(READ);
+      session.run('MATCH (n) RETURN n.name').then(result => {
+        expect(result.records.map(record => record.get(0))).toEqual(['Bob', 'Alice', 'Tina']);
+        session.close();
+        driver.close();
+        router.exit(code1 => {
+          reader.exit(code2 => {
+            expect(code1).toEqual(0);
+            expect(code2).toEqual(0);
+            done();
+          });
+        });
+      }).catch(done.fail);
+    });
+  });
+
   function testAddressPurgeOnDatabaseError(query, accessMode, done) {
     if (!boltStub.supported) {
       done();
