redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

fix: tls tests work again

Browse Source
This commit is contained in:
Ruben Bridgewater
2017-05-26 12:57:03 +02:00
parent 6794478066
commit f69aba72d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/stunnel-process.js
View File

@@ -21,7 +21,7 @@ function StunnelProcess (confDir) {
// Set up an stunnel to redis; edit the conf file to include required absolute paths // Set up an stunnel to redis; edit the conf file to include required absolute paths
const confFile = path.resolve(confDir, 'stunnel.conf') const confFile = path.resolve(confDir, 'stunnel.conf')
const confText = fs.readFileSync(`${confFile}.template`).toString().replace(/__dirname,/g, confDir) const confText = fs.readFileSync(`${confFile}.template`).toString().replace(/__dirname/g, confDir)
fs.writeFileSync(confFile, confText) fs.writeFileSync(confFile, confText)
const stunnel = this.stunnel = spawn('stunnel', [confFile]) const stunnel = this.stunnel = spawn('stunnel', [confFile])

4
test/tls.spec.js
View File

@@ -21,7 +21,7 @@ let skip = false
// Wait until stunnel4 is in the travis whitelist // Wait until stunnel4 is in the travis whitelist
// Check: https://github.com/travis-ci/apt-package-whitelist/issues/403 // Check: https://github.com/travis-ci/apt-package-whitelist/issues/403
// If this is merged, remove the travis env checks // If this is merged, remove the travis env checks
describe.skip('TLS connection tests', () => { describe('TLS connection tests', () => {
before((done) => { before((done) => {
// Print the warning when the tests run instead of while starting mocha // Print the warning when the tests run instead of while starting mocha
if (process.platform === 'win32') { if (process.platform === 'win32') {
@@ -121,7 +121,7 @@ describe.skip('TLS connection tests', () => {
assert(/DEPTH_ZERO_SELF_SIGNED_CERT/.test(err.code || err.message), err) assert(/DEPTH_ZERO_SELF_SIGNED_CERT/.test(err.code || err.message), err)
client.end(true) client.end(true)
}) })
return client.set('foo', 'bar').then(helper.isError()) return client.set('foo', 'bar').catch(helper.isError())
}) })
}) })
}) })