Merge pull request #4 from mayank23/master

fixed race-warmup-stategy to always resolve on first success, update/…

Author: mayank23

package.json

@@ -87,7 +87,8 @@
       "src/**/*.test.js"
     ],
     "roots": [
-      "src/"
+      "src/",
+      "test"
     ]
   },
   "eslintConfig": {

src/race-warmup-strategy.js

@@ -31,10 +31,10 @@ export default function raceWarmupStrategy(dsns, connectionPoolFactory, onCreati
           // and resolve if we haven't already done so
           (pool) => {
             numberProcessed += 1;
-            debug(`warmup: pool ${numberProcessed} created ${(pool.warmupError && 'with error') || ''}`);
+            debug(`warmup: pool ${numberProcessed} created ${(pool.error && 'with error') || ''}`);
             onCreation(pool);
             // we only want to resolve once
-            if (!resolved && !pool.warmupError) {
+            if (!resolved && !pool.error) {
               resolved = true;
               debug('warmup: resolved');
               resolve();

test/promise-execute-TVP-writes.test.js

@@ -1,12 +1,13 @@
 import * as sql from '../src';
+import delay from './delay';
 
 let connection;
 
 describe('execute TVP write using promise interface', () => {
   let originalTimeout;
   beforeAll(() => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
   });
   beforeEach(() => {
     connection = new sql.ConnectionPoolParty({
@@ -28,7 +29,6 @@ describe('execute TVP write using promise interface', () => {
       // need to give mssql ample time to clear the table so tests
       // don't step on eachother
       setTimeout(done, 5000);
-      done();
     }),
   );
   it('execute proc with TVP containing 10000 rows',
@@ -53,6 +53,7 @@ describe('execute TVP write using promise interface', () => {
       .then((results) => {
         expect(results.returnValue).toEqual(0);
       })
+      .then(delay(5000)) // allow all writes to be flushed from the buffer.
       .then(() => connection.request().query('SELECT * FROM PoolParty.dbo.PoolToys'))
       .then((results) => {
         expect(results.recordset.length).toEqual(10000);

test/promise-execute-many-writes.test.js

@@ -1,12 +1,13 @@
 import * as sql from '../src';
+import delay from './delay';
 
 let connection;
 
 describe('execute many writes tests using promise interface', () => {
   let originalTimeout;
   beforeAll(() => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
   });
   beforeEach(() => {
     connection = new sql.ConnectionPoolParty({
@@ -30,7 +31,6 @@ describe('execute many writes tests using promise interface', () => {
       // need to give mssql ample time to clear the table so tests
       // don't step on eachother
       setTimeout(done, 2000);
-      done();
     }),
   );
   it('perform 10000 writes',
@@ -54,6 +54,7 @@ describe('execute many writes tests using promise interface', () => {
       .then((results) => {
         expect(results.every(result => result.returnValue === 0)).toEqual(true);
       })
+      .then(delay(5000)) // allow all writes to be flushed from the buffer.
       .then(() => connection.request().query('SELECT * FROM PoolParty.dbo.PoolToys'))
       .then((results) => {
         expect(results.recordset.length).toEqual(10000);