try distribution by tests

Author: EugeniyKiyashko

.github/workflows/testcafe_tests.yml

@@ -54,7 +54,6 @@ jobs:
       shell: bash
       run: |
         echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-        pnpm config set network-concurrency 16
 
     - uses: actions/cache@v4
       name: Setup pnpm cache
@@ -73,7 +72,7 @@ jobs:
       shell: bash
       env:
         NODE_OPTIONS: --max-old-space-size=8192
-      run: pnpx nx build devextreme
+      run: pnpx nx build devextreme --uglify
 
     - name: Zip artifacts
       working-directory: ./packages/devextreme
@@ -105,11 +104,12 @@ jobs:
           { componentFolder: "cardView", name: "cardView" },
 
           # Scheduler tests need to be reworked to work in fluent theme
-          { componentFolder: "scheduler/common", name: "scheduler / common (1/5)", indices: "1/5", theme: 'generic.light' },
-          { componentFolder: "scheduler/common", name: "scheduler / common (2/5)", indices: "2/5", theme: 'generic.light' },
-          { componentFolder: "scheduler/common", name: "scheduler / common (3/5)", indices: "3/5", theme: 'generic.light' },
-          { componentFolder: "scheduler/common", name: "scheduler / common (4/5)", indices: "4/5", theme: 'generic.light' },
-          { componentFolder: "scheduler/common", name: "scheduler / common (5/5)", indices: "5/5", theme: 'generic.light' },
+          { componentFolder: "scheduler/common", name: "scheduler / common (1/6)", indices: "1/6", theme: 'generic.light' },
+          { componentFolder: "scheduler/common", name: "scheduler / common (2/6)", indices: "2/6", theme: 'generic.light' },
+          { componentFolder: "scheduler/common", name: "scheduler / common (3/6)", indices: "3/6", theme: 'generic.light' },
+          { componentFolder: "scheduler/common", name: "scheduler / common (4/6)", indices: "4/6", theme: 'generic.light' },
+          { componentFolder: "scheduler/common", name: "scheduler / common (5/6)", indices: "5/6", theme: 'generic.light' },
+          { componentFolder: "scheduler/common", name: "scheduler / common (6/6)", indices: "6/6", theme: 'generic.light' },
           { componentFolder: "scheduler/viewOffset/common", name: "scheduler / offset", theme: 'generic.light' },
           { componentFolder: "scheduler/viewOffset/markup", name: "scheduler / offset markups", theme: 'generic.light' },
           { componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin", theme: 'generic.light' },
@@ -158,10 +158,9 @@ jobs:
       shell: bash
       run: |
         echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-        pnpm config set network-concurrency 16
 
-    - uses: actions/cache@v4
-      name: Setup pnpm cache
+    - uses: actions/cache/restore@v4
+      name: Restore pnpm cache
       with:
         path: |
           ${{ env.STORE_PATH }}

e2e/testcafe-devextreme/runner.ts

@@ -3,7 +3,6 @@ import createTestCafe, { ClientFunction } from 'testcafe';
 import * as fs from 'fs';
 import * as process from 'process';
 import parseArgs from 'minimist';
-import { globSync } from 'glob';
 import { DEFAULT_BROWSER_SIZE } from './helpers/const';
 import {
   addShadowRootTree,
@@ -119,18 +118,6 @@ function getArgs(): ParsedArgs {
   }) as ParsedArgs;
 }
 
-const split = <T>(array: T[], chunkCount: number): T[][] => {
-  const fixturesInChunkCount = Math.ceil(array.length / chunkCount);
-  const arr = [...array];
-  const res: T[][] = [];
-
-  while (arr.length) {
-    res.push(arr.splice(0, fixturesInChunkCount));
-  }
-
-  return res;
-};
-
 async function main() {
   let testCafe: Awaited<ReturnType<typeof createTestCafe>> | null = null;
 
@@ -175,34 +162,26 @@ async function main() {
         },
       });
 
-      runner.concurrency(filterByFailedTests ? 1 : (args.concurrency || 4));
+      runner.concurrency(filterByFailedTests ? 1 : (args.concurrency || 5));
 
       const filters: FilterFunction[] = [];
 
-      if (indices) {
+      if (indices && !filterByFailedTests) {
         const [current, total] = indices.split(/_|of|\\|\//ig).map((x) => +x);
-        const fixtures = globSync([`./tests/${componentFolder}/*.ts`]);
-        const fixtureChunks = split(fixtures, total);
-        const targetFixtureChunk = fixtureChunks[current - 1] ?? [];
-        const targetFixtureChunkSet = new Set(targetFixtureChunk);
 
-        if (!filterByFailedTests) {
-          /* eslint-disable no-console */
-          console.info(' === test run config ===');
-          console.info(` > indices: current = ${current} | total = ${total}`);
-          console.info(' > glob: ', [`./tests/${componentFolder}/*.ts`]);
-          console.info(' > all fixtures: ', fixtureChunks);
-          console.info(' > fixtures: ', targetFixtureChunk, '\n');
-          /* eslint-enable no-console */
-        }
+        /* eslint-disable no-console */
+        console.info(' === test run config ===');
+        console.info(` > indices: current = ${current} | total = ${total}`);
+        console.info(' > strategy: round-robin by test (not by file)');
+        console.info(' > glob: ', [`./tests/${componentFolder}/*.ts`]);
+        console.info('\n');
+        /* eslint-enable no-console */
 
-        filters.push((
-          _testName: string,
-          _fixtureName: string,
-          fixturePath: string,
-        ) => {
-          const testPath = fixturePath.split('/testcafe-devextreme/')[1];
-          return targetFixtureChunkSet.has(testPath);
+        let globalTestIndex = 0;
+        filters.push(() => {
+          globalTestIndex += 1;
+          const testChunk = ((globalTestIndex - 1) % total) + 1;
+          return testChunk === current;
         });
       }
 
@@ -211,6 +190,16 @@ async function main() {
       }
 
       if (filterByFailedTests && failedTests.size > 0) {
+        /* eslint-disable no-console */
+        console.info('='.repeat(60));
+        console.info('RETRY FILTER CONFIGURATION');
+        console.info(`Failed tests to retry: ${failedTests.size}`);
+        console.info('Test names:');
+        failedTests.forEach((name) => console.info(`  - ${name}`));
+        console.info('='.repeat(60));
+        console.info('\n');
+        /* eslint-enable no-console */
+
         filters.push((name: string) => failedTests.has(name));
       }
 
@@ -328,6 +317,7 @@ async function main() {
 
         isRetryRun = true;
         const retryRunner = createRunner(true);
+
         failedCount = await retry(
           () => retryRunner.run(runOptions),
           LAUNCH_RETRY_ATTEMPTS,