replace delay.js with timers/promises

This commit is contained in:
Girish Ramakrishnan
2023-05-14 10:53:50 +02:00
parent 75ba20201e
commit 500d2361ec
14 changed files with 82 additions and 109 deletions

View File

@@ -7,9 +7,9 @@
'use strict';
const common = require('./common.js'),
delay = require('../../delay.js'),
expect = require('expect.js'),
superagent = require('superagent'),
timers = require('timers/promises'),
tokens = require('../../tokens.js');
describe('REST API', function () {
@@ -93,7 +93,7 @@ describe('REST API', function () {
.set('Authorization', 'Bearer ' + token2.accessToken);
expect(response.statusCode).to.be(200);
await delay(3000); // wait for token to expire
await timers.setTimeout(3000); // wait for token to expire
const response2 = await superagent.get(`${serverUrl}/api/v1/users/${user.id}`)
.set('Authorization', 'Bearer ' + token2.accessToken)

View File

@@ -2,7 +2,6 @@
const constants = require('../../constants.js'),
database = require('../../database.js'),
delay = require('../../delay.js'),
expect = require('expect.js'),
fs = require('fs'),
mailer = require('../../mailer.js'),
@@ -13,6 +12,7 @@ const constants = require('../../constants.js'),
support = require('../../support.js'),
superagent = require('superagent'),
tasks = require('../../tasks.js'),
timers = require('timers/promises'),
tokens = require('../../tokens.js');
exports = module.exports = {
@@ -75,7 +75,7 @@ async function setup() {
.send({ domainConfig: { provider: 'noop', domain: exports.dashboardDomain, config: {}, tlsConfig: { provider: 'fallback' } } });
expect(response.status).to.eql(200);
await delay(2000);
await timers.setTimeout(2000);
// create admin
response = await superagent.post(`${serverUrl}/api/v1/cloudron/activate`)
@@ -119,7 +119,7 @@ function clearMailQueue() {
}
async function checkMails(number) {
await delay(1000);
await timers.setTimeout(1000);
expect(mailer._mailQueue.length).to.equal(number);
clearMailQueue();
}
@@ -133,7 +133,7 @@ async function waitForTask(taskId) {
if (result.success) return result;
throw new Error(`Task ${taskId} failed: ${result.error.message} - ${result.error.stack}`);
}
await delay(2000);
await timers.setTimeout(2000);
console.log(`Waiting for task to ${taskId} finish`);
}
throw new Error(`Task ${taskId} never finished`);

View File

@@ -7,9 +7,9 @@
const common = require('./common.js');
const delay = require('../../delay.js'),
expect = require('expect.js'),
superagent = require('superagent');
const expect = require('expect.js'),
superagent = require('superagent'),
timers = require('timers/promises');
const DOMAIN = 'example-server-test.com';
@@ -27,7 +27,7 @@ describe('Provision', function () {
if (response.status === 200 && !response.body.setup.active && response.body.setup.errorMessage === '' && response.body.adminFqdn) return;
await delay(4000);
await timers.setTimeout(4000);
}
throw new Error(`Setup did not complete. status: ${response.status} body: ${JSON.stringify(response.body)}`);