Skip to content

Commit 2f4a80d

Browse files
daniel-liu-bitiodaniel-liu-bitio
committed
Remove commented out original tests
1 parent 8462ab8 commit 2f4a80d

File tree

9 files changed

+0
-465
lines changed

9 files changed

+0
-465
lines changed

‎packages/pg/test/integration/client/connection-timeout-tests.js

-89
Original file line numberDiff line numberDiff line change
@@ -85,92 +85,3 @@ suite.test('expired connection timeout', (done) => {
8585
.then(() => clearTimeout(timeoutId))
8686
})
8787
})
88-
89-
// 'use strict'
90-
// const net = require('net')
91-
// const buffers = require('../../test-buffers')
92-
// const helper = require('./test-helper')
93-
94-
// const suite = new helper.Suite()
95-
96-
// const options = {
97-
// host: 'localhost',
98-
// port: Math.floor(Math.random() * 2000) + 2000,
99-
// connectionTimeoutMillis: 2000,
100-
// user: 'not',
101-
// database: 'existing',
102-
// }
103-
104-
// const serverWithConnectionTimeout = (port, timeout, callback) => {
105-
// const sockets = new Set()
106-
107-
// const server = net.createServer((socket) => {
108-
// sockets.add(socket)
109-
// socket.once('end', () => sockets.delete(socket))
110-
111-
// socket.on('data', (data) => {
112-
// // deny request for SSL
113-
// if (data.length === 8) {
114-
// socket.write(Buffer.from('N', 'utf8'))
115-
// // consider all authentication requests as good
116-
// } else if (!data[0]) {
117-
// socket.write(buffers.authenticationOk())
118-
// // send ReadyForQuery `timeout` ms after authentication
119-
// setTimeout(() => socket.write(buffers.readyForQuery()), timeout).unref()
120-
// // respond with our canned response
121-
// } else {
122-
// socket.write(buffers.readyForQuery())
123-
// }
124-
// })
125-
// })
126-
127-
// let closing = false
128-
// const closeServer = (done) => {
129-
// if (closing) return
130-
// closing = true
131-
132-
// server.close(done)
133-
// for (const socket of sockets) {
134-
// socket.destroy()
135-
// }
136-
// }
137-
138-
// server.listen(port, options.host, () => callback(closeServer))
139-
// }
140-
141-
// suite.test('successful connection', (done) => {
142-
// serverWithConnectionTimeout(options.port, 0, (closeServer) => {
143-
// const timeoutId = setTimeout(() => {
144-
// throw new Error('Client should have connected successfully but it did not.')
145-
// }, 3000)
146-
147-
// const client = new helper.Client(options)
148-
// client
149-
// .connect()
150-
// .then(() => client.end())
151-
// .then(() => closeServer(done))
152-
// .catch((err) => closeServer(() => done(err)))
153-
// .then(() => clearTimeout(timeoutId))
154-
// })
155-
// })
156-
157-
// suite.test('expired connection timeout', (done) => {
158-
// const opts = { ...options, port: 54322 }
159-
// serverWithConnectionTimeout(opts.port, opts.connectionTimeoutMillis * 2, (closeServer) => {
160-
// const timeoutId = setTimeout(() => {
161-
// throw new Error('Client should have emitted an error but it did not.')
162-
// }, 3000)
163-
164-
// const client = new helper.Client(opts)
165-
// client
166-
// .connect()
167-
// .then(() => client.end())
168-
// .then(() => closeServer(() => done(new Error('Connection timeout should have expired but it did not.'))))
169-
// .catch((err) => {
170-
// assert(err instanceof Error)
171-
// assert(/timeout expired\s*/.test(err.message))
172-
// closeServer(done)
173-
// })
174-
// .then(() => clearTimeout(timeoutId))
175-
// })
176-
// })

‎packages/pg/test/integration/client/network-partition-tests.js

-97
Original file line numberDiff line numberDiff line change
@@ -93,100 +93,3 @@ suite.test('silent server', (done) => {
9393
const silentServer = new Server()
9494
testServer(silentServer, done)
9595
})
96-
97-
// 'use strict'
98-
// var buffers = require('../../test-buffers')
99-
// var helper = require('./test-helper')
100-
// var suite = new helper.Suite()
101-
102-
// var net = require('net')
103-
104-
// var Server = function (response) {
105-
// this.server = undefined
106-
// this.socket = undefined
107-
// this.response = response
108-
// }
109-
110-
// let port = 54321
111-
// Server.prototype.start = function (cb) {
112-
// // this is our fake postgres server
113-
// // it responds with our specified response immediatley after receiving every buffer
114-
// // this is sufficient into convincing the client its connectet to a valid backend
115-
// // if we respond with a readyForQuery message
116-
// this.server = net.createServer(
117-
// function (socket) {
118-
// this.socket = socket
119-
// if (this.response) {
120-
// this.socket.on(
121-
// 'data',
122-
// function (data) {
123-
// // deny request for SSL
124-
// if (data.length == 8) {
125-
// this.socket.write(Buffer.from('N', 'utf8'))
126-
// // consider all authentication requests as good
127-
// } else if (!data[0]) {
128-
// this.socket.write(buffers.authenticationOk())
129-
// // respond with our canned response
130-
// } else {
131-
// this.socket.write(this.response)
132-
// }
133-
// }.bind(this)
134-
// )
135-
// }
136-
// }.bind(this)
137-
// )
138-
139-
// port = port + 1
140-
141-
// var options = {
142-
// host: 'localhost',
143-
// port: port,
144-
// }
145-
// this.server.listen(options.port, options.host, function () {
146-
// cb(options)
147-
// })
148-
// }
149-
150-
// Server.prototype.drop = function () {
151-
// this.socket.destroy()
152-
// }
153-
154-
// Server.prototype.close = function (cb) {
155-
// this.server.close(cb)
156-
// }
157-
158-
// var testServer = function (server, cb) {
159-
// // wait for our server to start
160-
// server.start(function (options) {
161-
// // connect a client to it
162-
// var client = new helper.Client(options)
163-
// client.connect().catch((err) => {
164-
// console.log(err)
165-
// assert(err instanceof Error)
166-
// clearTimeout(timeoutId)
167-
// server.close(cb)
168-
// })
169-
170-
// server.server.on('connection', () => {
171-
// // after 50 milliseconds, drop the client
172-
// setTimeout(function () {
173-
// server.drop()
174-
// }, 50)
175-
// })
176-
177-
// // blow up if we don't receive an error
178-
// var timeoutId = setTimeout(function () {
179-
// throw new Error('Client should have emitted an error but it did not.')
180-
// }, 5000)
181-
// })
182-
// }
183-
184-
// suite.test('readyForQuery server', (done) => {
185-
// const respondingServer = new Server(buffers.readyForQuery())
186-
// testServer(respondingServer, done)
187-
// })
188-
189-
// suite.test('silent server', (done) => {
190-
// const silentServer = new Server()
191-
// testServer(silentServer, done)
192-
// })

‎packages/pg/test/integration/client/promise-api-tests.js

-9
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ suite.test('invalid uri rejects promise', (done) => {
2828
})
2929
})
3030

31-
// original:
32-
// suite.test('invalid connection rejects promise', (done) => {
33-
// const client = new pg.Client({ host: 'alksdjflaskdfj', port: 1234 })
34-
// return client.connect().catch((e) => {
35-
// assert(e instanceof Error)
36-
// done()
37-
// })
38-
// })
39-
4031
suite.test('connected client does not reject promise after connection', (done) => {
4132
const client = new pg.Client()
4233
return client.connect().then(() => {

‎packages/pg/test/integration/gh-issues/2079-tests.js

-54
Original file line numberDiff line numberDiff line change
@@ -51,57 +51,3 @@ suite.test('Non "S" response code allows event loop to exit', (done) => {
5151
done()
5252
})
5353
})
54-
55-
// 'use strict'
56-
// var helper = require('./../test-helper')
57-
// var assert = require('assert')
58-
59-
// const suite = new helper.Suite()
60-
61-
// // makes a backend server that responds with a non 'S' ssl response buffer
62-
// let makeTerminatingBackend = (byte) => {
63-
// const { createServer } = require('net')
64-
65-
// const server = createServer((socket) => {
66-
// // attach a listener so the socket can drain
67-
// // https://www.postgresql.org/docs/9.3/protocol-message-formats.html
68-
// socket.on('data', (buff) => {
69-
// const code = buff.readInt32BE(4)
70-
// // I don't see anything in the docs about 80877104
71-
// // but libpq is sending it...
72-
// if (code === 80877103 || code === 80877104) {
73-
// const packet = Buffer.from(byte, 'utf-8')
74-
// socket.write(packet)
75-
// }
76-
// })
77-
// socket.on('close', () => {
78-
// server.close()
79-
// })
80-
// })
81-
82-
// server.listen()
83-
// const { port } = server.address()
84-
// return port
85-
// }
86-
87-
// suite.test('SSL connection error allows event loop to exit', (done) => {
88-
// const port = makeTerminatingBackend('N')
89-
// const client = new helper.pg.Client({ ssl: 'require', port, host: 'localhost' })
90-
// // since there was a connection error the client's socket should be closed
91-
// // and the event loop will have no refs and exit cleanly
92-
// client.connect((err) => {
93-
// assert(err instanceof Error)
94-
// done()
95-
// })
96-
// })
97-
98-
// suite.test('Non "S" response code allows event loop to exit', (done) => {
99-
// const port = makeTerminatingBackend('X')
100-
// const client = new helper.pg.Client({ ssl: 'require', host: 'localhost', port })
101-
// // since there was a connection error the client's socket should be closed
102-
// // and the event loop will have no refs and exit cleanly
103-
// client.connect((err) => {
104-
// assert(err instanceof Error)
105-
// done()
106-
// })
107-
// })

‎packages/pg/test/unit/client/early-disconnect-tests.js

-22
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,3 @@ wss.on('listening', function () {
1818
})
1919
)
2020
})
21-
22-
// 'use strict'
23-
// var helper = require('./test-helper')
24-
// var net = require('net')
25-
// var pg = require('../../../lib/index.js')
26-
27-
// /* console.log() messages show up in `make test` output. TODO: fix it. */
28-
// var server = net.createServer(function (c) {
29-
// c.destroy()
30-
// server.close()
31-
// })
32-
33-
// server.listen(7777, function () {
34-
// var client = new pg.Client('postgres://localhost:7777')
35-
// client.connect(
36-
// assert.calls(function (err) {
37-
// console.log("ERROR IS "+err)
38-
// assert(err)
39-
// })
40-
// )
41-
// })
42-

‎packages/pg/test/unit/client/set-keepalives-tests.js

-32
This file was deleted.

‎packages/pg/test/unit/connection-parameters/creation-tests.js

-30
Original file line numberDiff line numberDiff line change
@@ -118,36 +118,6 @@ suite.test('do not double escape spaces', function () {
118118
assert.equal(subject.database, 'post gres')
119119
})
120120

121-
// suite.test('initializing with unix domain socket', function () {
122-
// var subject = new ConnectionParameters('/var/run/')
123-
// assert.ok(subject.isDomainSocket)
124-
// assert.equal(subject.host, '/var/run/')
125-
// assert.equal(subject.database, defaults.user)
126-
// })
127-
128-
// suite.test('initializing with unix domain socket and a specific database, the simple way', function () {
129-
// var subject = new ConnectionParameters('/var/run/ mydb')
130-
// assert.ok(subject.isDomainSocket)
131-
// assert.equal(subject.host, '/var/run/')
132-
// assert.equal(subject.database, 'mydb')
133-
// })
134-
135-
// suite.test('initializing with unix domain socket, the health way', function () {
136-
// var subject = new ConnectionParameters('socket:/some path/?db=my[db]&encoding=utf8')
137-
// assert.ok(subject.isDomainSocket)
138-
// assert.equal(subject.host, '/some path/')
139-
// assert.equal(subject.database, 'my[db]', 'must to be escaped and unescaped trough "my%5Bdb%5D"')
140-
// assert.equal(subject.client_encoding, 'utf8')
141-
// })
142-
143-
// suite.test('initializing with unix domain socket, the escaped health way', function () {
144-
// var subject = new ConnectionParameters('socket:/some%20path/?db=my%2Bdb&encoding=utf8')
145-
// assert.ok(subject.isDomainSocket)
146-
// assert.equal(subject.host, '/some path/')
147-
// assert.equal(subject.database, 'my+db')
148-
// assert.equal(subject.client_encoding, 'utf8')
149-
// })
150-
151121
var checkForPart = function (array, part) {
152122
assert.ok(array.indexOf(part) > -1, array.join(' ') + ' did not contain ' + part)
153123
}

0 commit comments

Comments
 (0)