Skip to content

Commit c78b302

Browse files
briancbrianc
authored
Cleanup tests (#3640)
1 parent e7fa94a commit c78b302

15 files changed

Lines changed: 363 additions & 361 deletions

File tree

‎packages/pg-cloudflare/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SocketOptions, Socket, TlsOptions } from 'cloudflare:sockets'
1+
import { SocketOptions, Socket, TlsOptions } from 'cloudflare:sockets' // eslint-disable-line
22
import { EventEmitter } from 'events'
33

44
/**

‎packages/pg/Makefile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ params := $(connectionString)
66

77
node-command := xargs -n 1 -I file node file $(params)
88

9-
.PHONY : test test-connection test-integration bench test-native \
9+
.PHONY : test test-integration bench test-native \
1010
publish update-npm
1111

1212
all:
@@ -30,11 +30,7 @@ test-unit:
3030
@chmod 600 test/unit/client/pgpass.file
3131
@find test/unit -name "*-tests.js" | $(node-command)
3232

33-
test-connection:
34-
@echo "***Testing connection***"
35-
@node script/create-test-tables.js $(params)
36-
37-
test-native: test-connection
33+
test-native:
3834
@echo "***Testing native bindings***"
3935
ifeq ($(TEST_SKIP_NATIVE), true)
4036
@echo "***Skipping tests***"
@@ -43,11 +39,11 @@ else
4339
@find test/integration -name "*-tests.js" | $(node-command) native
4440
endif
4541

46-
test-integration: test-connection
42+
test-integration:
4743
@echo "***Testing Pure Javascript***"
4844
@find test/integration -name "*-tests.js" | $(node-command)
4945

50-
test-binary: test-connection
46+
test-binary:
5147
@echo "***Testing Pure Javascript (binary)***"
5248
@find test/integration -name "*-tests.js" | $(node-command) binary
5349

‎packages/pg/script/create-test-tables.js‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎packages/pg/test/cli.js‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎packages/pg/test/cloudflare/vitest-cf.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { Pool } from 'pg'
22
import { test } from 'vitest'
33
import assert from 'assert'
4-
import args from '../cli'
54

65
test('default', async () => {
7-
const pool = new Pool(args)
6+
const pool = new Pool()
87
const result = await pool.query('SELECT $1::text as name', ['cloudflare'])
98
assert(result.rows[0].name === 'cloudflare')
109
pool.end()

‎packages/pg/test/integration/client/big-simple-query-tests.js‎

Lines changed: 69 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -18,71 +18,80 @@ const big_query_rows_2 = []
1818
const big_query_rows_3 = []
1919

2020
// Works
21-
suite.test('big simple query 1', function (done) {
21+
suite.test('big simple query 1', async function () {
2222
const client = helper.client()
23-
client
24-
.query(
25-
new Query(
26-
"select 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as bla from person where name = '' or 1 = 1"
23+
await helper.createPersonTable(client)
24+
return new Promise((resolve) => {
25+
client
26+
.query(
27+
new Query(
28+
"select 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as bla from person where name = '' or 1 = 1"
29+
)
2730
)
28-
)
29-
.on('row', function (row) {
30-
big_query_rows_1.push(row)
31+
.on('row', function (row) {
32+
big_query_rows_1.push(row)
33+
})
34+
.on('error', function (error) {
35+
console.log('big simple query 1 error')
36+
console.log(error)
37+
})
38+
client.on('drain', () => {
39+
client.end()
40+
resolve()
3141
})
32-
.on('error', function (error) {
33-
console.log('big simple query 1 error')
34-
console.log(error)
35-
})
36-
client.on('drain', () => {
37-
client.end()
38-
done()
3942
})
4043
})
4144

4245
// Works
43-
suite.test('big simple query 2', function (done) {
46+
suite.test('big simple query 2', async function () {
4447
const client = helper.client()
45-
client
46-
.query(
47-
new Query(
48-
"select 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as bla from person where name = $1 or 1 = 1",
49-
['']
48+
await helper.createPersonTable(client)
49+
return new Promise((resolve) => {
50+
client
51+
.query(
52+
new Query(
53+
"select 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as bla from person where name = $1 or 1 = 1",
54+
['']
55+
)
5056
)
51-
)
52-
.on('row', function (row) {
53-
big_query_rows_2.push(row)
54-
})
55-
.on('error', function (error) {
56-
console.log('big simple query 2 error')
57-
console.log(error)
57+
.on('row', function (row) {
58+
big_query_rows_2.push(row)
59+
})
60+
.on('error', function (error) {
61+
console.log('big simple query 2 error')
62+
console.log(error)
63+
})
64+
client.on('drain', () => {
65+
client.end()
66+
resolve()
5867
})
59-
client.on('drain', () => {
60-
client.end()
61-
done()
6268
})
6369
})
6470

6571
// Fails most of the time with 'invalid byte sequence for encoding "UTF8": 0xb9' or 'insufficient data left in message'
6672
// If test 1 and 2 are commented out it works
67-
suite.test('big simple query 3', function (done) {
73+
suite.test('big simple query 3', async function () {
6874
const client = helper.client()
69-
client
70-
.query(
71-
new Query(
72-
"select 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as bla from person where name = $1 or 1 = 1",
73-
['']
75+
await helper.createPersonTable(client)
76+
return new Promise((resolve) => {
77+
client
78+
.query(
79+
new Query(
80+
"select 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as bla from person where name = $1 or 1 = 1",
81+
['']
82+
)
7483
)
75-
)
76-
.on('row', function (row) {
77-
big_query_rows_3.push(row)
78-
})
79-
.on('error', function (error) {
80-
console.log('big simple query 3 error')
81-
console.log(error)
84+
.on('row', function (row) {
85+
big_query_rows_3.push(row)
86+
})
87+
.on('error', function (error) {
88+
console.log('big simple query 3 error')
89+
console.log(error)
90+
})
91+
client.on('drain', () => {
92+
client.end()
93+
resolve()
8294
})
83-
client.on('drain', () => {
84-
client.end()
85-
done()
8695
})
8796
})
8897

@@ -106,16 +115,19 @@ const runBigQuery = function (client) {
106115
)
107116
}
108117

109-
suite.test('many times', function (done) {
118+
suite.test('many times', async function () {
110119
const client = helper.client()
111-
for (let i = 0; i < 20; i++) {
112-
runBigQuery(client)
113-
}
114-
client.on('drain', function () {
115-
client.end()
116-
setTimeout(function () {
117-
done()
118-
// let client disconnect fully
119-
}, 100)
120+
await helper.createPersonTable(client)
121+
return new Promise((resolve) => {
122+
for (let i = 0; i < 20; i++) {
123+
runBigQuery(client)
124+
}
125+
client.on('drain', function () {
126+
client.end()
127+
setTimeout(function () {
128+
resolve()
129+
// let client disconnect fully
130+
}, 100)
131+
})
120132
})
121133
})

0 commit comments

Comments
 (0)