fix test

Author: devversion

.github/shared-actions/windows-bazel-test/action.yml

@@ -22,7 +22,10 @@ runs:
 
     - name: Initialize WSL
       id: init_wsl
-      uses: angular/dev-infra/github-actions/setup-wsl@0b004688d62e0fff2dbbb98362ff1b484348116a
+      uses: angular/dev-infra/github-actions/setup-wsl@574e50945ea191ebd1e1757fa7f6131cc9dbd7a9
+      with:
+        wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
+        wsl_networking_mode: 'mirrored'
     - name: Install node modules in WSL (re-using from previous install/cache restore)
       run: yarn install --immutable
       shell: wsl-bash {0}
@@ -32,15 +35,13 @@ runs:
     #   * symlink_prefix=/:    Needed as otherwise we will create unix symlinks in the Windows host.
     - run: |
         ${{inputs.command}} \
-          --//e2e/legacy-cli:enable_native_windows_testing=true \
+          --//tests/legacy-cli:enable_native_windows_testing=true \
           --test_env="NG_E2E_RUNNER_WSL_ROOT=${{steps.init_wsl.outputs.wsl_root_path}}" \
           --test_env="NG_E2E_RUNNER_WSL_UNC_BASE=${{steps.init_wsl.outputs.wsl_root_unc_path}}" \
           --test_env="NG_E2E_RUNNER_WINDOWS_CMD=${{steps.init_wsl.outputs.cmd_path}}" \
           --test_env="NG_E2E_RUNNER_WINDOWS_NPM=${{steps.init_wsl.outputs.npm_path}}" \
           --test_env="NG_E2E_RUNNER_WINDOWS_TMP_DIR=${{steps.init_wsl.outputs.tmp_path}}" \
           --test_env="NG_E2E_RUNNER_WINDOWS_GIT_BASH_BIN=${{steps.init_wsl.outputs.git_path}}" \
-          --test_env="NG_E2E_RUNNER_WSL_HOST_ADDR=$(ip route show | grep -i default | awk '{ print $3}')" \
-          --test_env="NG_E2E_RUNNER_WSL_VM_ADDR=$(hostname -I)" \
           --strategy=TestRunner=standalone \
           --symlink_prefix=/
       shell: wsl-bash {0}

.github/workflows/pr.yml

@@ -127,7 +127,7 @@ jobs:
 
   e2e-windows-subset:
     # needs: build
-    runs-on: windows-latest
+    runs-on: windows-2025
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d16848fd2ed19fce59488b540fa26a3353c72ad4
@@ -143,7 +143,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest]
+        os: [windows-2025]
         node: [22]
         subset: [npm, esbuild]
         shard: [0, 1, 2, 3, 4, 5]

packages/ngtools/webpack/BUILD.bazel

@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 

test.sh

@@ -1,12 +1,9 @@
 set -e
 
-yarn bazel build \
-    --config=e2e //tests/legacy-cli:e2e_node22
-
 yarn bazel test \
-    --config=e2e //tests/legacy-cli:e2e_node22 \
-    --spawn_strategy=local \
-    --test_filter="tests/basic/{build,rebuild}.ts" \
+    --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=1 \
+    --//tests/legacy-cli:enable_native_windows_testing=true \
+    --config=e2e //tests/legacy-cli:e2e.esbuild_node22 \
     --test_arg="--esbuild" \
     --test_env="NG_E2E_RUNNER_WSL_ROOT=C:\wsl_root" \
     --test_env="NG_E2E_RUNNER_WSL_UNC_BASE=\\\\wsl.localhost\Debian" \
@@ -17,4 +14,5 @@ yarn bazel test \
     --test_env="NG_E2E_RUNNER_WSL_HOST_ADDR=$(ip route show | grep -i default | awk '{ print $3}')" \
     --test_env="NG_E2E_RUNNER_WSL_VM_ADDR=$(hostname -I)" \
     --test_output=streamed \
-    --flaky_test_attempts=1
+    --flaky_test_attempts=1 \
+    --strategy=TestRunner=standalone

tests/legacy-cli/e2e.bzl

@@ -126,23 +126,18 @@ def _e2e_tests(name, runner, windows_node_repo, **kwargs):
     toolchains = toolchains + ["@npm//@angular/build-tooling/bazel/browsers/chromium:toolchain_alias"]
     data = data + ["@npm//@angular/build-tooling/bazel/browsers/chromium"]
 
-    windows_node_files = [
+    windows_test_files = [
         "@%s//:node_files" % windows_node_repo,
         "@%s//:npm_files" % windows_node_repo,
         "@%s//:bin/npm.cmd" % windows_node_repo,
+        "@org_chromium_chromedriver_windows//:metadata",
+        "@org_chromium_chromium_windows//:metadata",
     ]
 
     # In Windows native testing mode, add Windows dependencies. Those are not
     # available by default as we technically execute inside Linux/WSL.
-    toolchains = select({
-        "//e2e/legacy-cli:native_windows_testing": toolchains + [
-            "@org_chromium_chromedriver_windows//:metadata",
-            "@org_chromium_chromium_windows//:metadata",
-        ],
-        "//conditions:default": toolchains,
-    })
     data = select({
-        "//e2e/legacy-cli:native_windows_testing": data + windows_node_files,
+        "//tests/legacy-cli:native_windows_testing": data + windows_test_files,
         "//conditions:default": data,
     })
 

tests/legacy-cli/e2e/initialize/300-log-environment.ts

@@ -15,10 +15,12 @@ export default async function () {
     console.log(`  ${envName}: ${process.env[envName]!.replace(/[\n\r]+/g, '\n        ')}`);
   });
 
+  console.log(`----`);
+
   // On Windows, `which` might not be available.
   if (isWindowsTestMode()) {
     console.log(
-      `Skipping "$(which ng ${getActivePackageManager})" on Windows ` +
+      `Skipping "$(which ng ${getActivePackageManager()})" on Windows ` +
         `as the command may not be available.`,
     );
   } else {

tests/legacy-cli/e2e/setup/003-windows-wsl-prep.ts

@@ -1,6 +1,7 @@
-import { cp, realpath, symlink } from 'node:fs/promises';
-import { isWindowsTestMode, windowsTmpDir } from '../utils/wsl';
+import { cp, mkdir, realpath } from 'node:fs/promises';
 import path from 'node:path';
+import { getGlobalVariable } from '../utils/env';
+import { interopWslPathForOutsideIfNecessary, isWindowsTestMode } from '../utils/wsl';
 
 /**
  * Configure Windows WSL test setup, if needed.
@@ -11,15 +12,42 @@ export default async function () {
     return;
   }
 
-  // Unwrap the symlink of Windows. Windows will otherwise not be able to execute the binary.
+  // Expose Git binary in path. Node is already exposes via the NPM directory.
+  // These global tools are used by e2e tests.
+  process.env['PATH'] = [process.env.PATH, windowsMode.gitBinaryDirForWindows].join(path.delimiter);
+
+  // Unwrap the symlinks by Bazel. Windows will otherwise not be able to execute the binary.
   // Trick: We use the promises-variant as that one is not patched by Aspect and can resolve outside sandbox/runfiles.
-  const downloadedNodeBinary = await realpath(windowsMode.nodeBinaryForWindowsInsideWslPath);
+  const downloadedNodeBinary = await realpath(windowsMode.wslRootBinariesNeedingCopy.nodePath);
+  const downloadedChromium = await realpath(windowsMode.wslRootBinariesNeedingCopy.chromiumPath);
+  const downloadedChromedriver = await realpath(
+    windowsMode.wslRootBinariesNeedingCopy.chromedriverPath,
+  );
 
   // We will copy the Node version outside of WSL, as otherwise junctions to inside WSL,
   // or the UNC path system messes up npm.
-  await cp(downloadedNodeBinary, windowsMode.nodeBinaryForWindowsPath);
+  await cp(downloadedNodeBinary, windowsMode.copiedWindowsBinaries.nodePath);
 
-  // Expose Git binary in path. Node is already exposes via the NPM directory.
-  // These global tools are used by e2e tests.
-  process.env['PATH'] = [process.env.PATH, windowsMode.gitBinaryDirForWindows].join(path.delimiter);
+  const tmpRoot = getGlobalVariable('tmp-root');
+  const chromeTestingTmpDir = path.join(tmpRoot, 'chrome-testing-tools');
+  const chromiumDestDir = path.join(tmpRoot, 'chromium');
+  const chromedriverDestDir = path.join(tmpRoot, 'chromedriver');
+
+  await mkdir(chromeTestingTmpDir);
+  await cp(path.dirname(downloadedChromium), chromiumDestDir, { recursive: true });
+  await cp(path.dirname(downloadedChromedriver), chromedriverDestDir, { recursive: true });
+
+  const chromiumBinDestPath = path.join(chromiumDestDir, path.basename(downloadedChromium));
+  const chromedriverBinDestPath = path.join(
+    chromedriverDestDir,
+    path.basename(downloadedChromedriver),
+  );
+
+  process.env.CHROME_BIN = interopWslPathForOutsideIfNecessary(chromiumBinDestPath);
+  process.env.CHROME_PATH = interopWslPathForOutsideIfNecessary(chromiumBinDestPath);
+  process.env.CHROMEDRIVER_BIN = interopWslPathForOutsideIfNecessary(chromedriverBinDestPath);
+
+  // Update `TEMP` to the Windows tmp root that we configure in 001-create-tmp-dir.
+  // Otherwise we'd spawn Node processes outside WSL with a temp dir in the WSL VM.
+  process.env.TEMP = tmpRoot;
 }

tests/legacy-cli/e2e/tests/build/assets.ts

@@ -1,5 +1,10 @@
 import * as fs from 'node:fs';
-import { expectFileToExist, expectFileToMatch, writeFile } from '../../utils/fs';
+import {
+  crossPlatformSymlink,
+  expectFileToExist,
+  expectFileToMatch,
+  writeFile,
+} from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
@@ -28,7 +33,8 @@ export default async function () {
   fs.writeFileSync('dirToSymlink/subdir1/b.txt', '');
   fs.writeFileSync('dirToSymlink/subdir2/c.txt', '');
   fs.writeFileSync('dirToSymlink/subdir2/subsubdir1/d.txt', '');
-  fs.symlinkSync(process.cwd() + '/dirToSymlink', 'public/symlinkDir');
+
+  await crossPlatformSymlink(process.cwd() + '/dirToSymlink', 'public/symlinkDir');
 
   await ng('build', '--configuration=development');
 

tests/legacy-cli/e2e/tests/build/material.ts

@@ -89,5 +89,7 @@ export default async function () {
   `,
   );
 
+  console.error(process.env);
+
   await ng('e2e', '--configuration=production');
 }

tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts

@@ -4,6 +4,7 @@ import { appendToFile, createDir, rimraf } from '../../utils/fs';
 import { installWorkspacePackages } from '../../utils/packages';
 import { killAllProcesses, ng, waitForAnyProcessOutputToMatch } from '../../utils/process';
 import { ngServe, updateJsonFile, useSha } from '../../utils/project';
+import { rm } from 'node:fs/promises';
 
 const goodRegEx = getGlobalVariable('argv')['esbuild']
   ? /Application bundle generation complete\./
@@ -53,6 +54,6 @@ export default async function () {
   } finally {
     process.chdir(originalCwd);
     await killAllProcesses();
-    await setTimeout(100);
+    await setTimeout(500);
   }
 }