From f41839b83a43c6bd5efbfe68484119770da3a756 Mon Sep 17 00:00:00 2001 From: "Brian M. Carlson" Date: Tue, 13 Jun 2017 17:09:27 -0500 Subject: [PATCH] Work on test --- ...error-handling-prepared-statement-tests.js | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/test/integration/client/query-error-handling-prepared-statement-tests.js b/test/integration/client/query-error-handling-prepared-statement-tests.js index a7bda9c7..a250f78b 100644 --- a/test/integration/client/query-error-handling-prepared-statement-tests.js +++ b/test/integration/client/query-error-handling-prepared-statement-tests.js @@ -4,6 +4,41 @@ var util = require('util'); var suite = new helper.Suite(); +suite.test('client end during query execution of prepared statement', function(done) { + var client = new Client(helper.args); + client.connect(assert.success(function() { + + var sleepQuery = 'select pg_sleep($1)'; + + var queryConfig = { + name: 'sleep query', + text: sleepQuery, + values: [5], + } + + var queryInstance = new Query(queryConfig, assert.calls(function (err, result) { + assert.equal(err.message, 'Connection terminated'); + })) + + var query1 = client.query(queryInstance); + + + query1.on('error', function (err) { + assert.fail('Prepared statement should not emit error'); + }); + + query1.on('row', function (row) { + assert.fail('Prepared statement should not emit row'); + }); + + query1.on('end', function (err) { + assert.fail('Prepared statement when executed should not return before being killed'); + }); + + client.end(done); + })); +}); + function killIdleQuery(targetQuery, cb) { var client2 = new Client(helper.args); var pidColName = 'procpid' @@ -61,37 +96,3 @@ suite.test('query killed during query execution of prepared statement', function killIdleQuery(sleepQuery, done); })); }); - -suite.test('client end during query execution of prepared statement', function(done) { - var client = new Client(helper.args); - client.connect(assert.success(function() { - var sleepQuery = 'select pg_sleep($1)'; - - var queryConfig = { - name: 'sleep query', - text: sleepQuery, - values: [5], - } - - var queryInstance = new Query(queryConfig, assert.calls(function (err, result) { - assert.equal(err.message, 'Connection terminated'); - })) - - var query1 = client.query(queryInstance); - - - query1.on('error', function (err) { - assert.fail('Prepared statement should not emit error'); - }); - - query1.on('row', function (row) { - assert.fail('Prepared statement should not emit row'); - }); - - query1.on('end', function (err) { - assert.fail('Prepared statement when executed should not return before being killed'); - }); - - client.end(done); - })); -});