Add ref/unref noop to native client (brianc#2581)

brianc · web-flow · commit 779803fbce19 · 2021-07-27T12:23:30.000-05:00
* Add ref/unref noop to native client

* Use promise.catch in test

* Make partition test not flake on old node

* Fix test flake on old node
diff --git a/packages/pg-cursor/test/promises.js b/packages/pg-cursor/test/promises.js
@@ -26,7 +26,7 @@ describe('cursor using promises', function () {
 
   it('reject with error', function (done) {
     const cursor = this.pgCursor('select asdfasdf')
-    cursor.read(1).error((err) => {
+    cursor.read(1).catch((err) => {
       assert(err)
       done()
     })
diff --git a/packages/pg/lib/native/client.js b/packages/pg/lib/native/client.js
@@ -285,6 +285,9 @@ Client.prototype.cancel = function (query) {
   }
 }
 
+Client.prototype.ref = function () {}
+Client.prototype.unref = function () {}
+
 Client.prototype.setTypeParser = function (oid, format, parseFn) {
   return this._types.setTypeParser(oid, format, parseFn)
 }
diff --git a/packages/pg/test/integration/client/connection-timeout-tests.js b/packages/pg/test/integration/client/connection-timeout-tests.js
@@ -13,7 +13,7 @@ const options = {
   database: 'existing',
 }
 
-const serverWithConnectionTimeout = (timeout, callback) => {
+const serverWithConnectionTimeout = (port, timeout, callback) => {
   const sockets = new Set()
 
   const server = net.createServer((socket) => {
@@ -47,11 +47,11 @@ const serverWithConnectionTimeout = (timeout, callback) => {
     }
   }
 
-  server.listen(options.port, options.host, () => callback(closeServer))
+  server.listen(port, options.host, () => callback(closeServer))
 }
 
 suite.test('successful connection', (done) => {
-  serverWithConnectionTimeout(0, (closeServer) => {
+  serverWithConnectionTimeout(options.port, 0, (closeServer) => {
     const timeoutId = setTimeout(() => {
       throw new Error('Client should have connected successfully but it did not.')
     }, 3000)
@@ -67,12 +67,13 @@ suite.test('successful connection', (done) => {
 })
 
 suite.test('expired connection timeout', (done) => {
-  serverWithConnectionTimeout(options.connectionTimeoutMillis * 2, (closeServer) => {
+  const opts = { ...options, port: 54322 }
+  serverWithConnectionTimeout(opts.port, opts.connectionTimeoutMillis * 2, (closeServer) => {
     const timeoutId = setTimeout(() => {
       throw new Error('Client should have emitted an error but it did not.')
     }, 3000)
 
-    const client = new helper.Client(options)
+    const client = new helper.Client(opts)
     client
       .connect()
       .then(() => client.end())
diff --git a/packages/pg/test/integration/client/network-partition-tests.js b/packages/pg/test/integration/client/network-partition-tests.js
@@ -11,6 +11,7 @@ var Server = function (response) {
   this.response = response
 }
 
+let port = 54321
 Server.prototype.start = function (cb) {
   // this is our fake postgres server
   // it responds with our specified response immediatley after receiving every buffer
@@ -39,7 +40,7 @@ Server.prototype.start = function (cb) {
     }.bind(this)
   )
 
-  var port = 54321
+  port = port + 1
 
   var options = {
     host: 'localhost',

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,9 @@ Client.prototype.cancel = function (query) {`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`
	`288`	`+Client.prototype.ref = function () {}`
	`289`	`+Client.prototype.unref = function () {}`
	`290`	`+`
`288`	`291`	`Client.prototype.setTypeParser = function (oid, format, parseFn) {`
`289`	`292`	`return this._types.setTypeParser(oid, format, parseFn)`
`290`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ var Server = function (response) {`
`11`	`11`	`this.response = response`
`12`	`12`	`}`
`13`	`13`
	`14`	`+let port = 54321`
`14`	`15`	`Server.prototype.start = function (cb) {`
`15`	`16`	`// this is our fake postgres server`
`16`	`17`	`// it responds with our specified response immediatley after receiving every buffer`
`@@ -39,7 +40,7 @@ Server.prototype.start = function (cb) {`
`39`	`40`	`}.bind(this)`
`40`	`41`	`)`
`41`	`42`
`42`		`- var port = 54321`
	`43`	`+ port = port + 1`
`43`	`44`
`44`	`45`	`var options = {`
`45`	`46`	`host: 'localhost',`