Improve Cypress teardown

.github/workflows/nodejs.yml

@@ -94,6 +94,7 @@ jobs:
         env:
           CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
           IS_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true || github.repository_owner != 'decaporg' }}
+          # Only used for fork PRs (can't access CYPRESS_RECORD_KEY)
           MACHINE_INDEX: ${{ matrix.machine }}
           MACHINE_COUNT: 4
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

cypress/e2e/common/spec_utils.js

@@ -1,5 +1,5 @@
 export const before = (taskResult, options, backend) => {
-  Cypress.config('taskTimeout', 7 * 60 * 1000);
+  Cypress.config('taskTimeout', 5 * 60 * 1000); // 5 minutes
   cy.task('setupBackend', { backend, options }).then(data => {
     taskResult.data = data;
     Cypress.config('defaultCommandTimeout', data.mockResponses ? 5 * 1000 : 1 * 60 * 1000);
@@ -36,11 +36,17 @@ export const afterEach = (taskResult, backend) => {
   const spec = Cypress.mocha.getRunner().suite.ctx.currentTest.parent.title;
   const testName = Cypress.mocha.getRunner().suite.ctx.currentTest.title;
 
+  console.log(`Starting teardown for: ${spec} - ${testName}`);
+  const startTime = Date.now();
+
   cy.task('teardownBackendTest', {
     backend,
     ...taskResult.data,
     spec,
     testName,
+  }).then(() => {
+    const duration = Date.now() - startTime;
+    console.log(`Teardown completed in ${duration}ms for: ${spec} - ${testName}`);
   });
 
   if (!process.env.RECORD_FIXTURES) {

cypress/run.mjs

@@ -14,6 +14,8 @@ async function runCypress() {
   const machineCount = Number(process.env.MACHINE_COUNT || 0);
   const isFork = process.env.IS_FORK === 'true';
 
+  console.log(`IS_FORK: ${isFork}, MACHINE_INDEX: ${machineIndex}, MACHINE_COUNT: ${machineCount}`);
+
   if (isFork && machineIndex && machineCount) {
     const specsPerMachine = Math.floor(specs.length / machineCount);
     const start = (machineIndex - 1) * specsPerMachine;
@@ -58,7 +60,7 @@ async function runCypress() {
   await execa('cypress', args, {
     stdio: 'inherit',
     preferLocal: true,
-    timeout: 60 * 60 * 1000, // 1 hour
+    timeout: 30 * 60 * 1000, // 30 minutes
   });
 }