From a96d11b90f23acb9fa049384afb2ae272892fffa Mon Sep 17 00:00:00 2001 From: Touhidur Rahman Date: Fri, 18 Jul 2025 15:08:20 +0600 Subject: [PATCH 1/2] pkp/pkp-lib#11637 refactor job processing mechanism for tests to handle server timeout --- cypress/support/e2e.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js index 9a2943b4d4b..7eff22205b5 100644 --- a/cypress/support/e2e.js +++ b/cypress/support/e2e.js @@ -18,6 +18,18 @@ import './commands'; require('cypress-failed-log'); +// Rather than processing all pending jobs at the end of each test which may sometimes lead to timeouts +// if there are a large number of time consuming jobs queued, we will process 3 before each test +// and process 3 after each test and each of these 3 will be individually to minimize the chances of +// server timeouts instead of one single long running process. +beforeEach(function() { + cy.runQueueJobs(null, false, true); + cy.runQueueJobs(null, false, true); + cy.runQueueJobs(null, false, true); +}); + afterEach(function() { - cy.runQueueJobs(); + cy.runQueueJobs(null, false, true); + cy.runQueueJobs(null, false, true); + cy.runQueueJobs(null, false, true); }); From f4df1ab2c66feed8d45c32fbe1a6d229504952fc Mon Sep 17 00:00:00 2001 From: Touhidur Rahman Date: Fri, 18 Jul 2025 15:08:33 +0600 Subject: [PATCH 2/2] pkp/pkp-lib#11637 Submodule Update ##touhidurabir/i11637_stable_3_5_0## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index d166503f4c4..f7b81db2672 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit d166503f4c4ef695d33e4040e63fc5eaf117d3cb +Subproject commit f7b81db26728e9f18b6e556b4ca2b398900f7c0c