From 40ccdfd9b30ef8d328c2349eb5e4e419b0fbaceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 5 Nov 2018 18:37:20 +0100
Subject: [PATCH] Drain pool connection before

---
 test/acceptance/user-database-timeout-limit.js | 2 +-
 test/support/test-client.js                    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js
index 3448ebfc..660c07c0 100644
--- a/test/acceptance/user-database-timeout-limit.js
+++ b/test/acceptance/user-database-timeout-limit.js
@@ -94,7 +94,7 @@ const DATASOURCE_TIMEOUT_ERROR = {
     }]
 };
 
-describe('user database timeout limit', function () {
+describe.only('user database timeout limit', function () {
     describe('dataview', function () {
         beforeEach(function (done) {
             const mapconfig = createMapConfig();
diff --git a/test/support/test-client.js b/test/support/test-client.js
index 8801b4a1..a7237e00 100644
--- a/test/support/test-client.js
+++ b/test/support/test-client.js
@@ -1275,6 +1275,11 @@ TestClient.prototype.setUserDatabaseTimeoutLimit = function (timeoutLimit, callb
     });
 
     step(
+        // we need to guarantee all new connections have the new settings
+        function beforeRefreshPoolConnection () {
+            const next = this;
+            psql.end(() => next());
+        },
         function configureTimeouts () {
             const timeoutSQLs = [
                 `ALTER ROLE "${publicuser}" SET STATEMENT_TIMEOUT TO ${timeoutLimit}`,