Skip to content

Commit

Permalink
temporary commit
Browse files Browse the repository at this point in the history
  • Loading branch information
charmander committed Nov 6, 2020
1 parent 0de1b54 commit 7587128
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -14,6 +14,7 @@ matrix:
PGSSLROOTCERT=$TRAVIS_BUILD_DIR/packages/pg/test/tls/test-server-ca.crt
PGSSLCERT=$TRAVIS_BUILD_DIR/packages/pg/test/tls/test-client.crt
PGSSLKEY=$TRAVIS_BUILD_DIR/packages/pg/test/tls/test-client.key
PG_CLIENT_CERT_TEST=1
before_script:
- |
cat <<'travis ci breaks heredoc' | sudo tee -a /etc/postgresql/10/main/postgresql.conf
Expand All @@ -26,6 +27,6 @@ matrix:
- sudo make -C packages/pg/test/tls install DESTDIR=/etc/postgresql/10/main
- sudo systemctl restart postgresql
- yarn build
- node packages/pg/script/create-test-tables.js postgresql:///
script: |
yarn lerna exec --scope pg yarn test
node packages/pg/test/integration/connection-pool/test-tls.js
node packages/pg/test/integration/connection-pool/test-tls.js native
2 changes: 0 additions & 2 deletions packages/pg/script/create-test-tables.js
Expand Up @@ -56,8 +56,6 @@ if (process.env.PGSSLMODE) {
}
}

console.log('%O', config.ssl)

var con = new pg.Client(config)

con.connect((err) => {
Expand Down
23 changes: 23 additions & 0 deletions packages/pg/test/integration/connection-pool/tls-tests.js
@@ -0,0 +1,23 @@
'use strict'

const fs = require('fs')

const helper = require('./test-helper')
const pg = helper.pg

const suite = new helper.Suite()

if (process.env.PG_CLIENT_CERT_TEST) {
suite.testAsync('client certificate', async () => {
const pool = new pg.Pool({
ssl: {
ca: fs.readFileSync(process.env.PGSSLROOTCERT),
cert: fs.readFileSync(process.env.PGSSLCERT),
key: fs.readFileSync(process.env.PGSSLKEY),
},
})

await pool.query('SELECT 1')
await pool.end()
})
}

0 comments on commit 7587128

Please sign in to comment.