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

tasks: rework the startTask API

Browse Source 
it is now async. change was required to reset the pending flag
This commit is contained in:
Girish Ramakrishnan
2025-06-17 18:54:12 +02:00
parent 4770b32287
commit d9c104613c
13 changed files with 178 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/test/tasks-test.js
+49 -67
View File
@@ -7,6 +7,7 @@
const common = require('./common.js'),
expect = require('expect.js'),
safe = require('safetydance'),
superagent = require('../../superagent.js'),
tasks = require('../../tasks.js');
@@ -19,99 +20,80 @@ describe('Tasks API', function () {
it('can get task', async function () {
const taskId = await tasks.add(tasks._TASK_IDENTITY, [ 'ping' ]);
return new Promise((resolve) => {
tasks.startTask(taskId, {}, async function () {
const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}`)
.query({ access_token: owner.token });
await tasks.startTask(taskId, {});
expect(response.status).to.equal(200);
expect(response.body.percent).to.be(100);
expect(response.body.args).to.be(undefined);
expect(response.body.active).to.be(false); // finished
expect(response.body.success).to.be(true);
expect(response.body.result).to.be('ping');
expect(response.body.error).to.be(null);
resolve();
});
});
const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}`)
.query({ access_token: owner.token });
expect(response.status).to.equal(200);
expect(response.body.percent).to.be(100);
expect(response.body.args).to.be(undefined);
expect(response.body.active).to.be(false); // finished
expect(response.body.success).to.be(true);
expect(response.body.result).to.be('ping');
expect(response.body.error).to.be(null);
});
it('can get logs', async function () {
const taskId = await tasks.add(tasks._TASK_CRASH, [ 'ping' ]);
const taskId = await tasks.add(tasks._TASK_IDENTITY, [ 'ping' ]);
return new Promise((resolve, reject) => {
tasks.startTask(taskId, {}, async function () {
const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}/logs`)
.query({ access_token: owner.token });
await tasks.startTask(taskId, {});
const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}/logs`)
.query({ access_token: owner.token });
if (response.status !== 200) return reject(new Error('Expecting 200'));
resolve();
});
});
if (response.status !== 200) throw new Error('Expecting 200');
});
it('cannot stop inactive task', async function () {
const taskId = await tasks.add(tasks._TASK_IDENTITY, [ 'ping' ]);
return new Promise((resolve, reject) => {
tasks.startTask(taskId, {}, async function () {
const response = await superagent.post(`${serverUrl}/api/v1/tasks/${taskId}/stop`)
.query({ access_token: owner.token })
.send({})
.ok(() => true);
await tasks.startTask(taskId, {});
const response = await superagent.post(`${serverUrl}/api/v1/tasks/${taskId}/stop`)
.query({ access_token: owner.token })
.send({})
.ok(() => true);
if (response.status !== 409) return reject(new Error('Expecting 409'));
resolve();
});
});
if (response.status !== 409) throw Error('Expecting 409');
});
it('can stop task', async function () {
const taskId = await tasks.add(tasks._TASK_SLEEP, [ 10000 ]);
return new Promise((resolve) => {
tasks.startTask(taskId, {}, async function () {
const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}`)
.query({ access_token: owner.token });
setTimeout(async function () {
const response = await superagent.post(`${serverUrl}/api/v1/tasks/${taskId}/stop`)
.query({ access_token: owner.token });
expect(response.status).to.equal(200);
expect(response.body.percent).to.be(100);
expect(response.body.active).to.be(false); // finished
expect(response.body.success).to.be(false);
expect(response.body.result).to.be(null);
expect(response.body.error.message).to.contain('stopped');
resolve();
});
expect(response.status).to.equal(204);
}, 100);
setTimeout(async function () {
const response = await superagent.post(`${serverUrl}/api/v1/tasks/${taskId}/stop`)
.query({ access_token: owner.token });
await safe(tasks.startTask(taskId, {}));
const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}`)
.query({ access_token: owner.token });
expect(response.status).to.equal(204);
}, 100);
});
expect(response.status).to.equal(200);
expect(response.body.percent).to.be(100);
expect(response.body.active).to.be(false); // finished
expect(response.body.success).to.be(false);
expect(response.body.result).to.be(null);
expect(response.body.error.message).to.contain('stopped');
});
it('can list tasks', async function () {
const taskId = await tasks.add(tasks._TASK_IDENTITY, [ 'ping' ]);
return new Promise((resolve) => {
tasks.startTask(taskId, {}, async function () {
const response = await superagent.get(`${serverUrl}/api/v1/tasks?type=${tasks._TASK_IDENTITY}`)
.query({ access_token: owner.token });
await tasks.startTask(taskId, {});
const response = await superagent.get(`${serverUrl}/api/v1/tasks?type=${tasks._TASK_IDENTITY}`)
.query({ access_token: owner.token });
expect(response.status).to.equal(200);
expect(response.body.tasks.length >= 1).to.be(true);
expect(response.body.tasks[0].id).to.be(taskId);
expect(response.body.tasks[0].percent).to.be(100);
expect(response.body.tasks[0].args).to.be(undefined);
expect(response.body.tasks[0].active).to.be(false); // finished
expect(response.body.tasks[0].success).to.be(true); // finished
expect(response.body.tasks[0].result).to.be('ping');
expect(response.body.tasks[0].error).to.be(null);
resolve();
});
});
expect(response.status).to.equal(200);
expect(response.body.tasks.length >= 1).to.be(true);
expect(response.body.tasks[0].id).to.be(taskId);
expect(response.body.tasks[0].percent).to.be(100);
expect(response.body.tasks[0].args).to.be(undefined);
expect(response.body.tasks[0].active).to.be(false); // finished
expect(response.body.tasks[0].success).to.be(true); // finished
expect(response.body.tasks[0].result).to.be('ping');
expect(response.body.tasks[0].error).to.be(null);
});
});