Improved fake job server to handle concurrent jobs

zonia3000 · zonia3000 · commit 11126f0077b4 · 2024-09-17T17:34:11.000+02:00
diff --git a/tests/fake-job-server.js b/tests/fake-job-server.js
@@ -4,7 +4,10 @@ const PORT = process.env.PORT || 8080;
 
 const server = createServer();
 
-const tasksStatusMap = new Map();
+/** @type {Map<number, string>} */
+const jobsStatusMapV1 = new Map();
+/** @type {Map<number, string>} */
+const jobsStatusMapV2 = new Map();
 
 server.on('request', (request, response) => {
 	response.setHeader('Content-type', 'text/plain');
@@ -20,46 +23,65 @@ server.on('request', (request, response) => {
 		if (!task) {
 			return badRequest(response, 'missing task identifier');
 		}
-		const status = getTaskStatus(task);
+		const { version, jobId } = extractJobInfo(task);
+		const status = getJobStatus(version, jobId);
 		if (request.method === 'GET' && status !== 'submitted') {
-			tasksStatusMap.delete(task);
+			console.log(`Removing job ${jobId}`);
+			getJobStatusMap(version).delete(jobId);
 		}
 		response.end(status);
 	} else {
 		// PUT method is called by Playwright tests to update the desired task status
-		if (url.pathname.startsWith('/done')) {
-			setRunningTasksTo('done');
-			response.end('done');
-		} else if (url.pathname.startsWith('/failed')) {
-			setRunningTasksTo('failed');
-			response.end('failed');
+		const match = url.pathname.match(/\/(v1|v2)\/(\d+)/);
+		if (!match) {
+			return badRequest(response, `missing job identifier in ${url.pathname}`);
 		}
+		const jobId = Number(match[2]);
+		const status = url.searchParams.get('status');
+		if (!status) {
+			return badRequest(response, 'missing status');
+		}
+		const version = url.pathname.startsWith('/v2') ? 'v2' : 'v1';
+		console.log(`Setting job ${jobId} status to ${status}`);
+		getJobStatusMap(version).set(Number(jobId), status);
+		response.end(status);
 	}
 });
 
-function getTaskStatus(task) {
-	if (!tasksStatusMap.has(task)) {
-		console.log(`Creating entry for task ${task}`);
-		// Set all the other running tasks to failed
-		// If there are no flacky tests there shouldn't be other running tasks
-		setRunningTasksTo('failed');
-		// Add new task as submitted
-		tasksStatusMap.set(task, 'submitted');
+/**
+ * @param {string} taskFolder
+ */
+function extractJobInfo(taskFolder) {
+	const match = taskFolder.match(/job_(\d+)/);
+	if (!match) {
+		throw new Error(`Unable to extract job id from ${taskFolder}`);
 	}
-	return tasksStatusMap.get(task);
+	const version = taskFolder.includes('proj_v2') ? 'v2' : 'v1';
+	return { jobId: Number(match[1]), version };
 }
 
 /**
- * We handle only one running task, to simplify the fake server.
- * In case of flacky Playwright tests there could be more than one submitted task.
- * In that case we set all the submitted task to the same desired final value.
- * @param {string} status
+ * @param {string} version
+ * @param {number} jobId
+ * @returns {string|undefined}
  */
-function setRunningTasksTo(status) {
-	for (const [key, value] of tasksStatusMap.entries()) {
-		if (value === 'submitted') {
-			tasksStatusMap.set(key, status);
-		}
+function getJobStatus(version, jobId) {
+	const jobsStatusMap = getJobStatusMap(version);
+	if (!jobsStatusMap.has(jobId)) {
+		console.log(`Creating entry for job ${jobId}`);
+		jobsStatusMap.set(jobId, 'submitted');
+	}
+	return jobsStatusMap.get(jobId);
+}
+
+/**
+ * @param {string} version
+ */
+function getJobStatusMap(version) {
+	if (version === 'v1') {
+		return jobsStatusMapV1;
+	} else {
+		return jobsStatusMapV2;
 	}
 }
 
diff --git a/tests/v1/admin_jobs.spec.js b/tests/v1/admin_jobs.spec.js
@@ -1,14 +1,15 @@
 import { expect, test } from '@playwright/test';
-import { waitPageLoading } from '../utils.js';
+import { waitModalClosed, waitPageLoading } from '../utils.js';
 import { PageWithWorkflow } from './workflow_fixture.js';
 import * as fs from 'fs';
 
 test('Execute a job and show it on the job tables [v1]', async ({ page, request }) => {
 	/** @type {PageWithWorkflow} */
 	let workflow1;
 	await test.step('Create first job and wait its failure', async () => {
-		workflow1 = await createJob(page, request, 'input', 'output');
-		await workflow1.triggerTaskFailure();
+		const job = await createJob(page, request, 'input', 'output');
+		workflow1 = job.workflow;
+		await workflow1.triggerTaskFailure(job.jobId);
 		const jobBadge = page.locator('.badge.text-bg-danger');
 		await jobBadge.waitFor();
 		expect(await jobBadge.innerText()).toEqual('failed');
@@ -17,8 +18,12 @@ test('Execute a job and show it on the job tables [v1]', async ({ page, request
 
 	/** @type {PageWithWorkflow} */
 	let workflow2;
+	/** @type {number} */
+	let jobId2;
 	await test.step('Create second job', async () => {
-		workflow2 = await createJob(page, request, 'input2', 'output2');
+		const job = await createJob(page, request, 'input2', 'output2');
+		workflow2 = job.workflow;
+		jobId2 = job.jobId;
 	});
 
 	await test.step('Open the admin jobs', async () => {
@@ -84,7 +89,7 @@ test('Execute a job and show it on the job tables [v1]', async ({ page, request
 	});
 
 	await test.step('Wait job completion', async () => {
-		await workflow2.triggerTaskSuccess();
+		await workflow2.triggerTaskSuccess(jobId2);
 		const jobBadge = page.locator('.badge.text-bg-success');
 		await jobBadge.waitFor();
 		expect(await jobBadge.innerText()).toEqual('done');
@@ -161,19 +166,22 @@ async function getWorkflowRow(page, workflowName) {
  * @param {import('@playwright/test').APIRequestContext} request
  * @param {string} inputDataset
  * @param {string} outputDataset
+ * @returns {Promise<{ workflow: PageWithWorkflow, jobId: number }>}
  */
 async function createJob(page, request, inputDataset, outputDataset) {
 	const workflow = new PageWithWorkflow(page, request);
+	/** @type {number|undefined} */
+	let jobId;
 	await test.step('Create workflow', async () => {
 		await workflow.createProject();
 		await workflow.createDataset(inputDataset, 'image');
 		await workflow.createDataset(outputDataset, 'zarr');
 		await workflow.createWorkflow();
 		await page.waitForURL(/** @type {string} */ (workflow.url));
 		await addTaskToWorkflow(workflow);
-		await runWorkflow(page, inputDataset, outputDataset);
+		jobId = await runWorkflow(page, inputDataset, outputDataset);
 	});
-	return workflow;
+	return { workflow, jobId: /** @type {number} */ (jobId) };
 }
 
 /**
@@ -189,8 +197,11 @@ async function addTaskToWorkflow(workflow) {
  * @param {import('@playwright/test').Page} page
  * @param {string} inputDataset
  * @param {string} outputDataset
+ * @returns {Promise<number>} the id of the job
  */
 async function runWorkflow(page, inputDataset, outputDataset) {
+	/** @type {number|undefined} */
+	let jobId;
 	await test.step('Run workflow', async () => {
 		const runWorkflowBtn = page.getByRole('button', { name: 'Run workflow' });
 		await runWorkflowBtn.click();
@@ -204,5 +215,16 @@ async function runWorkflow(page, inputDataset, outputDataset) {
 		const confirmBtn = page.locator('.modal.show').getByRole('button', { name: 'Confirm' });
 		await confirmBtn.click();
 		await page.waitForURL(new RegExp(`/v1/projects/(\\d+)/workflows/(\\d+)/jobs`));
+		await page
+			.getByRole('row', { name: 'submitted' })
+			.getByRole('button', { name: 'Info' })
+			.click();
+		const modal = page.locator('.modal.show');
+		await modal.waitFor();
+		const value = await modal.getByRole('listitem').nth(1).textContent();
+		jobId = Number(value?.trim());
+		await modal.getByRole('button', { name: 'Close' }).click();
+		await waitModalClosed(page);
 	});
+	return /** @type {number} */ (jobId);
 }
diff --git a/tests/v1/jobs.spec.js b/tests/v1/jobs.spec.js
@@ -25,7 +25,9 @@ test('Execute jobs', async ({ page, workflow }) => {
 	});
 
 	await test.step('Check workflow jobs page', async () => {
-		await page.waitForURL(`/v1/projects/${workflow.projectId}/workflows/${workflow.workflowId}/jobs`);
+		await page.waitForURL(
+			`/v1/projects/${workflow.projectId}/workflows/${workflow.workflowId}/jobs`
+		);
 		await page.locator('table tbody').waitFor();
 		expect(await page.locator('table tbody tr').count()).toEqual(1);
 		const cells = await page.locator('table tbody tr td').allInnerTexts();
@@ -82,7 +84,7 @@ test('Execute jobs', async ({ page, workflow }) => {
 		const modalTitle = page.locator('.modal.show .modal-title');
 		await modalTitle.waitFor();
 		await expect(modalTitle).toHaveText('Workflow Job logs');
-		await workflow.triggerTaskFailure();
+		await workflow.triggerTaskFailure(jobId);
 		await page.waitForFunction(() => {
 			const modalBody = document.querySelector('.modal.show .modal-body');
 			return modalBody instanceof HTMLElement && modalBody.innerText.includes('TASK ERROR');
diff --git a/tests/v1/workflow_fixture.js b/tests/v1/workflow_fixture.js
@@ -71,19 +71,26 @@ export class PageWithWorkflow extends PageWithProject {
 		await this.addUserTask('Fake Task');
 	}
 
-	async triggerTaskSuccess() {
-		await this.setTaskStatus('done');
+	/**
+	 * @param {number} jobId
+	 */
+	async triggerTaskSuccess(jobId) {
+		await this.setTaskStatus(jobId, 'done');
 	}
 
-	async triggerTaskFailure() {
-		await this.setTaskStatus('failed');
+	/**
+	 * @param {number} jobId
+	 */
+	async triggerTaskFailure(jobId) {
+		await this.setTaskStatus(jobId, 'failed');
 	}
 
 	/**
+	 * @param {number} jobId
 	 * @param {import('$lib/types.js').JobStatus} status
 	 */
-	async setTaskStatus(status) {
-		const response = await this.request.put(`http://localhost:8080/${status}`);
+	async setTaskStatus(jobId, status) {
+		const response = await this.request.put(`http://localhost:8080/v1/${jobId}?status=${status}`);
 		expect(response.ok()).toEqual(true);
 	}
 
diff --git a/tests/v2/admin_jobs.spec.js b/tests/v2/admin_jobs.spec.js
@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test';
-import { waitPageLoading } from '../utils.js';
+import { waitModalClosed, waitPageLoading } from '../utils.js';
 import { PageWithWorkflow } from './workflow_fixture.js';
 import * as fs from 'fs';
 import { createDataset } from './dataset_utils.js';
@@ -37,12 +37,15 @@ test('Execute a job and show it on the job tables [v2]', async ({ page, request
 	let workflow2;
 	/** @type {string} */
 	let dataset2;
+	/** @type {number} */
+	let jobId2;
 	await test.step('Create second job', async () => {
 		const job = await createJob(page, request, async function (workflow) {
 			await workflow.addUserTask(taskName);
 		});
 		workflow2 = job.workflow;
 		dataset2 = job.dataset;
+		jobId2 = job.jobId;
 		await waitTaskSubmitted(page, 1);
 	});
 
@@ -105,7 +108,7 @@ test('Execute a job and show it on the job tables [v2]', async ({ page, request
 	});
 
 	await test.step('Wait job completion', async () => {
-		await workflow2.triggerTaskSuccess();
+		await workflow2.triggerTaskSuccess(jobId2);
 		const jobBadge = page.locator('.badge.text-bg-success');
 		await jobBadge.waitFor();
 		expect(await jobBadge.innerText()).toEqual('done');
@@ -179,28 +182,33 @@ async function getWorkflowRow(page, workflowName) {
  * @param {import('@playwright/test').Page} page
  * @param {import('@playwright/test').APIRequestContext} request
  * @param {(workflow: PageWithWorkflow) => Promise<void>} addTask
- * @returns {Promise<{ workflow: PageWithWorkflow, dataset: string }>}
+ * @returns {Promise<{ workflow: PageWithWorkflow, dataset: string, jobId: number }>}
  */
 async function createJob(page, request, addTask) {
 	const workflow = new PageWithWorkflow(page, request);
 	let datasetName = '';
+	/** @type {number|undefined} */
+	let jobId;
 	await test.step('Create workflow', async () => {
 		const projectId = await workflow.createProject();
 		const datasetResult = await createDataset(page, projectId);
 		datasetName = datasetResult.name;
 		await workflow.createWorkflow();
 		await page.waitForURL(/** @type {string} */ (workflow.url));
 		await addTask(workflow);
-		await runWorkflow(page, datasetName);
+		jobId = await runWorkflow(page, datasetName);
 	});
-	return { workflow, dataset: datasetName };
+	return { workflow, dataset: datasetName, jobId: /** @type {number} */ (jobId) };
 }
 
 /**
  * @param {import('@playwright/test').Page} page
  * @param {string} dataset
+ * @returns {Promise<number>} the id of the job
  */
 async function runWorkflow(page, dataset) {
+	/** @type {number|undefined} */
+	let jobId;
 	await test.step('Run workflow', async () => {
 		await page
 			.getByRole('combobox', { name: 'Dataset', exact: true })
@@ -215,5 +223,19 @@ async function runWorkflow(page, dataset) {
 		await runBtn.click();
 		const confirmBtn = page.locator('.modal.show').getByRole('button', { name: 'Confirm' });
 		await confirmBtn.click();
+		await page.getByRole('link', { name: 'List jobs' }).click();
+		await waitPageLoading(page);
+		await page
+			.getByRole('row', { name: 'submitted' })
+			.getByRole('button', { name: 'Info' })
+			.click();
+		const modal = page.locator('.modal.show');
+		await modal.waitFor();
+		const value = await modal.getByRole('listitem').nth(1).textContent();
+		jobId = Number(value?.trim());
+		await modal.getByRole('button', { name: 'Close' }).click();
+		await waitModalClosed(page);
+		await page.goBack();
 	});
+	return /** @type {number} */ (jobId);
 }
diff --git a/tests/v2/workflow_fixture.js b/tests/v2/workflow_fixture.js
@@ -54,19 +54,26 @@ export class PageWithWorkflow extends PageWithProject {
 		await this.addUserTask('Fake Task');
 	}
 
-	async triggerTaskSuccess() {
-		await this.setTaskStatus('done');
+	/**
+	 * @param {number} jobId
+	 */
+	async triggerTaskSuccess(jobId) {
+		await this.setTaskStatus(jobId, 'done');
 	}
 
-	async triggerTaskFailure() {
-		await this.setTaskStatus('failed');
+	/**
+	 * @param {number} jobId
+	 */
+	async triggerTaskFailure(jobId) {
+		await this.setTaskStatus(jobId, 'failed');
 	}
 
 	/**
+	 * @param {number} jobId
 	 * @param {import('$lib/types.js').JobStatus} status
 	 */
-	async setTaskStatus(status) {
-		const response = await this.request.put(`http://localhost:8080/${status}`);
+	async setTaskStatus(jobId, status) {
+		const response = await this.request.put(`http://localhost:8080/v2/${jobId}?status=${status}`);
 		expect(response.ok()).toEqual(true);
 	}
 
