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

replace delay.js with timers/promises

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/backupcleaner-test.js
View File

@@ -9,11 +9,11 @@
const backupCleaner = require('../backupcleaner.js'),
backups = require('../backups.js'),
common = require('./common.js'),
delay = require('../delay.js'),
expect = require('expect.js'),
moment = require('moment'),
settings = require('../settings.js'),
tasks = require('../tasks.js');
tasks = require('../tasks.js'),
timers = require('timers/promises');
describe('backup cleaner', function () {
const { setup, cleanup, app } = common;
@@ -226,7 +226,7 @@ describe('backup cleaner', function () {
// eslint-disable-next-line no-constant-condition
while (true) {
await delay(1000);
await timers.setTimeout(1000);
const p = await tasks.get(taskId);
@@ -247,7 +247,7 @@ describe('backup cleaner', function () {
BACKUP_0_BOX.dependsOn = [ BACKUP_0_APP_0.id, BACKUP_0_APP_1.id ];
BACKUP_0_BOX.id = await backups.add(BACKUP_0_BOX);
await delay(2000); // space out backups
await timers.setTimeout(2000); // space out backups
BACKUP_1_APP_0.id = await backups.add(BACKUP_1_APP_0);
BACKUP_1_APP_1.id = await backups.add(BACKUP_1_APP_1);
@@ -284,7 +284,7 @@ describe('backup cleaner', function () {
backup.id = await backups.add(backup);
}
await delay(2000); // wait for expiration
await timers.setTimeout(2000); // wait for expiration
await cleanupBackups();

8
src/test/backuptask-test.js
View File

@@ -8,13 +8,13 @@
const backups = require('../backups.js'),
common = require('./common.js'),
delay = require('../delay.js'),
expect = require('expect.js'),
fs = require('fs'),
os = require('os'),
path = require('path'),
settings = require('../settings.js'),
tasks = require('../tasks.js');
tasks = require('../tasks.js'),
timers = require('timers/promises');
describe('backuptask', function () {
const { setup, cleanup } = common;
@@ -48,7 +48,7 @@ describe('backuptask', function () {
// eslint-disable-next-line no-constant-condition
while (true) {
await delay(1000);
await timers.setTimeout(1000);
const p = await tasks.get(taskId);
@@ -61,7 +61,7 @@ describe('backuptask', function () {
if (result.length !== 1) throw new Error('result is not of length 1');
// the task progress and the db entry is set in the worker. wait for 2 seconds for backup lock to get released in parent process
await delay(2000);
await timers.setTimeout(2000);
return result[0];
}

52
src/test/common.js
View File

@@ -3,7 +3,6 @@
const apps = require('../apps.js'),
constants = require('../constants.js'),
database = require('../database.js'),
delay = require('../delay.js'),
domains = require('../domains.js'),
expect = require('expect.js'),
fs = require('fs'),
@@ -13,6 +12,7 @@ const apps = require('../apps.js'),
paths = require('../paths.js'),
settings = require('../settings.js'),
tasks = require('../tasks.js'),
timers = require('timers/promises'),
users = require('../users.js');
const manifest = {
@@ -45,30 +45,30 @@ const manifest = {
// copied from the proxy app CloudronManifest.json
const proxyAppManifest = {
"id": "io.cloudron.builtin.appproxy",
"title": "App Proxy",
"author": "Cloudron Team",
"version": "1.0.0",
"upstreamVersion": "1.0.0",
"description": "file://DESCRIPTION.md",
"tagline": "Proxy an app through Cloudron",
"tags": [ "proxy", "external" ],
"healthCheckPath": "/",
"httpPort": 3000,
"minBoxVersion": "7.3.0",
"dockerImage": "istobeignored",
"manifestVersion": 2,
"multiDomain": true,
"website": "https://cloudron.io",
"documentationUrl": "https://docs.cloudron.io/dashboard/#app-proxy",
"forumUrl": "https://forum.cloudron.io",
"contactEmail": "support@cloudron.io",
"icon": "file://logo.png",
"addons": {},
"mediaLinks": [
"https://screenshots.cloudron.io/io.cloudron.builtin.appproxy/diagram.png"
],
"changelog": "file://CHANGELOG.md"
'id': 'io.cloudron.builtin.appproxy',
'title': 'App Proxy',
'author': 'Cloudron Team',
'version': '1.0.0',
'upstreamVersion': '1.0.0',
'description': 'file://DESCRIPTION.md',
'tagline': 'Proxy an app through Cloudron',
'tags': [ 'proxy', 'external' ],
'healthCheckPath': '/',
'httpPort': 3000,
'minBoxVersion': '7.3.0',
'dockerImage': 'istobeignored',
'manifestVersion': 2,
'multiDomain': true,
'website': 'https://cloudron.io',
'documentationUrl': 'https://docs.cloudron.io/dashboard/#app-proxy',
'forumUrl': 'https://forum.cloudron.io',
'contactEmail': 'support@cloudron.io',
'icon': 'file://logo.png',
'addons': {},
'mediaLinks': [
'https://screenshots.cloudron.io/io.cloudron.builtin.appproxy/diagram.png'
],
'changelog': 'file://CHANGELOG.md'
};
const domain = {
@@ -249,7 +249,7 @@ function clearMailQueue() {
}
async function checkMails(number) {
await delay(1000);
await timers.setTimeout(1000);
expect(mailer._mailQueue.length).to.equal(number);
const emails = mailer._mailQueue;
clearMailQueue();

8
src/test/eventlog-test.js
View File

@@ -8,10 +8,10 @@
const common = require('./common.js'),
database = require('../database.js'),
delay = require('../delay.js'),
eventlog = require('../eventlog.js'),
expect = require('expect.js'),
notifications = require('../notifications.js');
notifications = require('../notifications.js'),
timers = require('timers/promises');
describe('Eventlog', function () {
const { setup, cleanup } = common;
@@ -89,7 +89,7 @@ describe('Eventlog', function () {
let result = await eventlog.get(loginEventId);
const oldCreationTime = result.creationTime;
await delay(2000);
await timers.setTimeout(2000);
result = await eventlog.upsertLoginEvent('user.login', { ip: '1.2.3.4' }, { appId: 'thatapp' });
expect(result).to.equal(loginEventId);
@@ -117,7 +117,7 @@ describe('Eventlog', function () {
await notifications._add('title', 'some message', { eventId });
}
await delay(3000);
await timers.setTimeout(3000);
const id = await eventlog.add(eventlog.ACTION_USER_LOGIN, { ip: '1.2.3.4' }, { appId: 'thatapp' });

6
src/test/notifications-test.js
View File

@@ -8,10 +8,10 @@
const BoxError = require('../boxerror.js'),
common = require('./common.js'),
delay = require('../delay.js'),
expect = require('expect.js'),
notifications = require('../notifications.js'),
safe = require('safetydance');
safe = require('safetydance'),
timers = require('timers/promises');
const EVENT_0 = {
id: 'event_0',
@@ -34,7 +34,7 @@ describe('Notifications', function () {
expect(error).to.equal(null);
expect(id).to.be.a('string');
notificationIds.push(id);
await delay(1000);
await timers.setTimeout(1000);
}
});