Make couple boltkit tests less flaky

Author: lutovich

test/resources/boltkit/acquire_endpoints_and_exit.script

@@ -0,0 +1,10 @@
+!: AUTO INIT
+!: AUTO RESET
+!: AUTO PULL_ALL
+
+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 {}
+S: <EXIT>

test/resources/boltkit/read_server_and_exit.script

@@ -0,0 +1,15 @@
+!: AUTO INIT
+!: AUTO RESET
+!: AUTO PULL_ALL
+!: AUTO RUN "COMMIT" {}
+!: AUTO RUN "ROLLBACK" {}
+!: AUTO RUN "BEGIN" {}
+
+C: RUN "MATCH (n) RETURN n.name" {}
+   PULL_ALL
+S: SUCCESS {"fields": ["n.name"]}
+   RECORD ["Bob"]
+   RECORD ["Alice"]
+   RECORD ["Tina"]
+   SUCCESS {}
+S: <EXIT>

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

@@ -1466,27 +1466,44 @@ describe('routing driver', () => {
     }
 
     const kit = new boltkit.BoltKit();
-    const router1 = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9010);
+    // use scripts that exit eagerly when they are executed to simulate failed servers
+    const router1 = kit.start('./test/resources/boltkit/acquire_endpoints_and_exit.script', 9010);
+    const tmpReader = kit.start('./test/resources/boltkit/read_server_and_exit.script', 9005);
 
     kit.run(() => {
       const driver = newDriver('bolt+routing://127.0.0.1:9010');
-      const session = driver.session();
 
-      // restart router on the same port with different script that contains itself as reader
-      router1.exit(() => {
-        const router2 = kit.start('./test/resources/boltkit/rediscover_using_initial_router.script', 9010);
-
-        session.readTransaction(tx => tx.run('MATCH (n) RETURN n.name AS name')).then(result => {
-          const records = result.records;
-          expect(records.length).toEqual(2);
-          expect(records[0].get('name')).toEqual('Bob');
-          expect(records[1].get('name')).toEqual('Alice');
+      // run a dummy query to force routing table initialization
+      const session = driver.session(READ);
+      session.run('MATCH (n) RETURN n.name').then(result => {
+        expect(result.records.length).toEqual(3);
+        session.close(() => {
+          // stop existing router and reader
+          router1.exit(code1 => {
+            tmpReader.exit(code2 => {
+              // at this point previously used router and reader should be dead
+              expect(code1).toEqual(0);
+              expect(code2).toEqual(0);
 
-          session.close(() => {
-            driver.close();
-            router2.exit(code => {
-              expect(code).toEqual(0);
-              done();
+              // start new router on the same port with different script that contains itself as reader
+              const router2 = kit.start('./test/resources/boltkit/rediscover_using_initial_router.script', 9010);
+
+              kit.run(() => {
+                session.readTransaction(tx => tx.run('MATCH (n) RETURN n.name AS name')).then(result => {
+                  const records = result.records;
+                  expect(records.length).toEqual(2);
+                  expect(records[0].get('name')).toEqual('Bob');
+                  expect(records[1].get('name')).toEqual('Alice');
+
+                  session.close(() => {
+                    driver.close();
+                    router2.exit(code => {
+                      expect(code).toEqual(0);
+                      done();
+                    });
+                  });
+                });
+              });
             });
           });
         });
@@ -1502,28 +1519,28 @@ describe('routing driver', () => {
 
     const kit = new boltkit.BoltKit();
     const router1 = kit.start('./test/resources/boltkit/acquire_endpoints.script', 9010);
+    // start new router on a different port to emulate host name resolution
+    // this router uses different script that contains itself as reader
+    const router2 = kit.start('./test/resources/boltkit/rediscover_using_initial_router.script', 9009);
 
     kit.run(() => {
       const driver = newDriver('bolt+routing://127.0.0.1:9010');
       // make seed address resolve to 3 different addresses (only last one has backing stub server):
       setupFakeHostNameResolution(driver, '127.0.0.1:9010', ['127.0.0.1:9011', '127.0.0.1:9012', '127.0.0.1:9009']);
       const session = driver.session();
 
-      // start new router on a different port to emulate host name resolution
-      // this router uses different script that contains itself as reader
-      router1.exit(() => {
-        const router2 = kit.start('./test/resources/boltkit/rediscover_using_initial_router.script', 9009);
-
-        session.readTransaction(tx => tx.run('MATCH (n) RETURN n.name AS name')).then(result => {
-          const records = result.records;
-          expect(records.length).toEqual(2);
-          expect(records[0].get('name')).toEqual('Bob');
-          expect(records[1].get('name')).toEqual('Alice');
+      session.readTransaction(tx => tx.run('MATCH (n) RETURN n.name AS name')).then(result => {
+        const records = result.records;
+        expect(records.length).toEqual(2);
+        expect(records[0].get('name')).toEqual('Bob');
+        expect(records[1].get('name')).toEqual('Alice');
 
-          session.close(() => {
-            driver.close();
-            router2.exit(code => {
-              expect(code).toEqual(0);
+        session.close(() => {
+          driver.close();
+          router1.exit(code1 => {
+            router2.exit(code2 => {
+              expect(code1).toEqual(0);
+              expect(code2).toEqual(0);
               done();
             });
           });