jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

sysinfo: async'ify

Browse Source 
in the process, provision, dyndns, mail, dns also got further asyncified
This commit is contained in:
Girish Ramakrishnan
2021-08-27 09:52:24 -07:00
parent 1856caf972
commit 51d067cbe3
26 changed files with 782 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/test/mail-test.js
+8 -11
View File
@@ -51,16 +51,15 @@ describe('Mail API', function () {
const dns = require('../../dns.js');
// replace dns resolveTxt()
resolve = dns.resolve;
dns.resolve = function (hostname, type, options, callback) {
resolve = dns.promises.resolve;
dns.promises.resolve = async function (hostname, type/*, options*/) {
expect(hostname).to.be.a('string');
expect(callback).to.be.a('function');
if (!dnsAnswerQueue[hostname] || !(type in dnsAnswerQueue[hostname])) return callback(new Error('no mock answer'));
if (!dnsAnswerQueue[hostname] || !(type in dnsAnswerQueue[hostname])) throw new Error('no mock answer');
if (dnsAnswerQueue[hostname][type] === null) return callback(new Error({ code: 'ENODATA'} ));
if (dnsAnswerQueue[hostname][type] === null) throw new Error({ code: 'ENODATA'} );
callback(null, dnsAnswerQueue[hostname][type]);
return dnsAnswerQueue[hostname][type];
};
dkimDomain = `cloudron._domainkey.${dashboardDomain}`; // no suffix for provisioned domains
@@ -81,7 +80,7 @@ describe('Mail API', function () {
after(function (done) {
const dns = require('../../dns.js');
dns.resolve = resolve;
dns.promises.resolve = resolve;
done();
});
@@ -108,8 +107,6 @@ describe('Mail API', function () {
.query({ access_token: owner.token });
expect(response.statusCode).to.equal(200);
console.dir(response.body);
expect(response.body.dns.dkim).to.be.an('object');
expect(response.body.dns.dkim.domain).to.eql(dkimDomain);
expect(response.body.dns.dkim.type).to.eql('TXT');
@@ -228,7 +225,7 @@ describe('Mail API', function () {
dnsAnswerQueue[spfDomain].TXT = [['v=spf1 a:example.com a:' + settings.mailFqdn() + ' ~all']];
const response = await superagent.get(`${serverUrl}/api/v1/mail/${dashboardDomain}` + '/status')
const response = await superagent.get(`${serverUrl}/api/v1/mail/${dashboardDomain}/status`)
.query({ access_token: owner.token });
expect(response.statusCode).to.equal(200);
@@ -246,7 +243,7 @@ describe('Mail API', function () {
dnsAnswerQueue[dmarcDomain].TXT = [['v=DMARC1; p=reject; rua=mailto:rua@example.com; pct=100']];
const response = await superagent.get(`${serverUrl}/api/v1/mail/${dashboardDomain}` + '/status')
const response = await superagent.get(`${serverUrl}/api/v1/mail/${dashboardDomain}/status`)
.query({ access_token: owner.token });
expect(response.statusCode).to.equal(200);