Skip to content

Commit b5fd654

Browse files
committed
Verify presence of test DNS entries.
Closes #529.
1 parent 5746766 commit b5fd654

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

test/integration/account-creation-oidc-test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const supertest = require('supertest')
22
// Helper functions for the FS
33
const $rdf = require('rdflib')
44

5-
const { rm, read } = require('../utils')
5+
const { rm, read, checkDnsSettings } = require('../utils')
66
const ldnode = require('../../index')
77
const path = require('path')
88
const fs = require('fs-extra')
@@ -26,6 +26,8 @@ describe('AccountManager (OIDC account creation tests)', function () {
2626
serverUri
2727
})
2828

29+
before(checkDnsSettings)
30+
2931
before(function (done) {
3032
ldpHttpsServer = ldp.listen(3457, done)
3133
})

test/integration/acl-oidc-test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const assert = require('chai').assert
22
const fs = require('fs-extra')
33
const request = require('request')
44
const path = require('path')
5-
const { loadProvider, rm } = require('../utils')
5+
const { loadProvider, rm, checkDnsSettings } = require('../utils')
66
const IDToken = require('@trust/oidc-op/src/IDToken')
77

88
const ldnode = require('../../index')
@@ -60,6 +60,8 @@ const argv = {
6060
describe('ACL HTTP', function () {
6161
let ldp, ldpHttpsServer
6262

63+
before(checkDnsSettings)
64+
6365
before(done => {
6466
ldp = ldnode.createServer(argv)
6567

test/integration/cors-proxy-test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var assert = require('chai').assert
22
var supertest = require('supertest')
33
var path = require('path')
44
var nock = require('nock')
5+
var { checkDnsSettings } = require('../utils')
56

67
var ldnode = require('../../index')
78

@@ -13,6 +14,8 @@ describe('CORS Proxy', () => {
1314
})
1415
var server = supertest(ldp)
1516

17+
before(checkDnsSettings)
18+
1619
it('should return the website in /proxy?uri', (done) => {
1720
nock('https://example.org').get('/').reply(200)
1821
server.get('/proxy?uri=https://example.org/')

test/utils.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ var fsExtra = require('fs-extra')
33
var rimraf = require('rimraf')
44
var path = require('path')
55
const OIDCProvider = require('@trust/oidc-op')
6+
const dns = require('dns')
7+
8+
const TEST_HOSTS = ['nic.localhost', 'tim.localhost', 'nicola.localhost']
69

710
exports.rm = function (file) {
811
return rimraf.sync(path.join(__dirname, '/resources/' + file))
@@ -35,6 +38,24 @@ exports.restore = function (src) {
3538
exports.rm(src + '.bak')
3639
}
3740

41+
// Verifies that all HOSTS entries are present
42+
exports.checkDnsSettings = function () {
43+
return Promise.all(TEST_HOSTS.map(hostname => {
44+
return new Promise((resolve, reject) => {
45+
dns.lookup(hostname, (error, ip) => {
46+
if (error || ip !== '127.0.0.1') {
47+
reject(error)
48+
} else {
49+
resolve(true)
50+
}
51+
})
52+
})
53+
}))
54+
.catch(() => {
55+
throw new Error(`Expected HOSTS entries of 127.0.0.1 for ${TEST_HOSTS.join()}`)
56+
})
57+
}
58+
3859
/**
3960
* @param configPath {string}
4061
*

0 commit comments

Comments
 (0)