From 839043206de96fee710c55776a803895702dc299 Mon Sep 17 00:00:00 2001 From: Andrew Heuermann Date: Sat, 28 Dec 2019 09:01:35 -0600 Subject: [PATCH] Only run tests on >= v10 --- ...le_in_transaction_session_timeout-tests.js | 74 +++++++++++-------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/packages/pg/test/integration/client/idle_in_transaction_session_timeout-tests.js b/packages/pg/test/integration/client/idle_in_transaction_session_timeout-tests.js index b40a5ace6..4435a40b6 100644 --- a/packages/pg/test/integration/client/idle_in_transaction_session_timeout-tests.js +++ b/packages/pg/test/integration/client/idle_in_transaction_session_timeout-tests.js @@ -10,6 +10,19 @@ function getConInfo (override) { return Object.assign({}, conInfo, override ) } +function testClientVersion(cb) { + var client = new Client({}) + client.connect(assert.success(function () { + helper.versionGTE(client, 100000, assert.success(function(isGreater) { + if (!isGreater) { + console.log('skip idle_in_transaction_session_timeout at client-level is only available in v10 and above'); + return client.end(); + } + cb(); + })) + })) +} + function getIdleTransactionSessionTimeout (conf, cb) { var client = new Client(conf) client.connect(assert.success(function () { @@ -22,42 +35,43 @@ function getIdleTransactionSessionTimeout (conf, cb) { } if (!helper.args.native) { // idle_in_transaction_session_timeout is not supported with the native client - suite.test('No default idle_in_transaction_session_timeout ', function (done) { - getConInfo() - getIdleTransactionSessionTimeout({}, function (res) { - assert.strictEqual(res, '0') // 0 = no timeout - done() + testClientVersion(function(){ + suite.test('No default idle_in_transaction_session_timeout ', function (done) { + getConInfo() + getIdleTransactionSessionTimeout({}, function (res) { + assert.strictEqual(res, '0') // 0 = no timeout + done() + }) }) - }) - suite.test('idle_in_transaction_session_timeout integer is used', function (done) { - var conf = getConInfo({ - 'idle_in_transaction_session_timeout': 3000 + suite.test('idle_in_transaction_session_timeout integer is used', function (done) { + var conf = getConInfo({ + 'idle_in_transaction_session_timeout': 3000 + }) + getIdleTransactionSessionTimeout(conf, function (res) { + assert.strictEqual(res, '3s') + done() + }) }) - getIdleTransactionSessionTimeout(conf, function (res) { - assert.strictEqual(res, '3s') - done() - }) - }) - suite.test('idle_in_transaction_session_timeout float is used', function (done) { - var conf = getConInfo({ - 'idle_in_transaction_session_timeout': 3000.7 - }) - getIdleTransactionSessionTimeout(conf, function (res) { - assert.strictEqual(res, '3s') - done() + suite.test('idle_in_transaction_session_timeout float is used', function (done) { + var conf = getConInfo({ + 'idle_in_transaction_session_timeout': 3000.7 + }) + getIdleTransactionSessionTimeout(conf, function (res) { + assert.strictEqual(res, '3s') + done() + }) }) - }) - suite.test('idle_in_transaction_session_timeout string is used', function (done) { - var conf = getConInfo({ - 'idle_in_transaction_session_timeout': '3000' - }) - getIdleTransactionSessionTimeout(conf, function (res) { - assert.strictEqual(res, '3s') - done() + suite.test('idle_in_transaction_session_timeout string is used', function (done) { + var conf = getConInfo({ + 'idle_in_transaction_session_timeout': '3000' + }) + getIdleTransactionSessionTimeout(conf, function (res) { + assert.strictEqual(res, '3s') + done() + }) }) }) - }