test

Author: devversion

.github/workflows/pr.yml

@@ -127,7 +127,7 @@ jobs:
 
   e2e-windows-subset:
     # needs: build
-    runs-on: windows-2025
+    runs-on: windows-latest
     steps:
       # Git checkout converts to CRLF by default. This causes the Aspect lock
       # files to differ. See: https://github.com/actions/checkout/issues/135.
@@ -153,8 +153,6 @@ jobs:
           wsl-conf: |
             [interop]
               appendWindowsPath=false
-            [wsl2]
-              networkingMode=mirrored
           wsl-shell-command: bash --login -euo pipefail
           additional-packages: |
             curl
@@ -213,6 +211,8 @@ jobs:
               --test_env="NG_E2E_RUNNER_WINDOWS_NPM=${{steps.wsl_paths.outputs.npm_path}}" \
               --test_env="NG_E2E_RUNNER_WINDOWS_TMP_DIR=${{steps.wsl_paths.outputs.tmp_path}}" \
               --test_env="NG_E2E_RUNNER_WINDOWS_GIT_BASH_BIN=${{steps.wsl_paths.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)" \
               --test_output=streamed \
               --strategy=TestRunner=standalone
         shell: wsl-bash {0}

packages/angular/build/src/builders/dev-server/tests/behavior/serve-live-reload-proxies_spec.ts

@@ -16,6 +16,7 @@ import { count, debounceTime, finalize, switchMap, take, timeout } from 'rxjs';
 import { executeDevServer } from '../../index';
 import { describeServeBuilder } from '../jasmine-helpers';
 import { BASE_OPTIONS, BUILD_TIMEOUT, DEV_SERVER_BUILDER_INFO } from '../setup';
+import { loopbackAddr } from '../../../../../../../../tests/legacy-cli/e2e/utils/env';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare const document: any;
@@ -102,7 +103,7 @@ async function createProxy(target: string, secure: boolean, ws = true): Promise<
 
   return {
     server,
-    url: `${secure ? 'https' : 'http'}://localhost:${proxyPort}`,
+    url: `${secure ? 'https' : 'http'}://${loopbackAddr}:${proxyPort}`,
   };
 }
 

packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/serve-live-reload-proxies_spec.ts

@@ -16,6 +16,7 @@ import { count, debounceTime, finalize, switchMap, take, timeout } from 'rxjs';
 import { executeDevServer } from '../../index';
 import { describeServeBuilder } from '../jasmine-helpers';
 import { BASE_OPTIONS, BUILD_TIMEOUT, DEV_SERVER_BUILDER_INFO } from '../setup';
+import { loopbackAddr } from '../../../../../../../../tests/legacy-cli/e2e/utils/env';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare const document: any;
@@ -102,7 +103,7 @@ async function createProxy(target: string, secure: boolean, ws = true): Promise<
 
   return {
     server,
-    url: `${secure ? 'https' : 'http'}://localhost:${proxyPort}`,
+    url: `${secure ? 'https' : 'http'}://${loopbackAddr}:${proxyPort}`,
   };
 }
 

test.sh

@@ -14,5 +14,7 @@ yarn bazel test \
     --test_env="NG_E2E_RUNNER_WINDOWS_NPM=C:\Program Files\nodejs\npm" \
     --test_env="NG_E2E_RUNNER_WINDOWS_TMP_DIR=/mnt/c/Users/paulg/AppData/Local/Temp" \
     --test_env="NG_E2E_RUNNER_WINDOWS_GIT_BASH_BIN=/mnt/c/Program Files/Git/bin/git" \
+    --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

tests/legacy-cli/e2e/tests/basic/rebuild.ts

@@ -67,7 +67,7 @@ export default async function () {
   ]);
   {
     console.error(`http://localhost:${port}/main.js`);
-    await setTimeout(1000 * 60 * 20);
+    // await setTimeout(1000 * 60 * 20);
     const response = await fetch(`http://localhost:${port}/main.js`);
     const body = await response.text();
     if (!body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) {

tests/legacy-cli/e2e/utils/env.ts

@@ -1,5 +1,8 @@
 const ENV_PREFIX = 'LEGACY_CLI__';
 
+export const loopbackAddr = process.env.NG_E2E_RUNNER_WSL_HOST_ADDR?.trim() ?? 'localhost';
+export const registryAddr = process.env.NG_E2E_RUNNER_WSL_VM_ADDR?.trim() ?? 'localhost';
+
 export function setGlobalVariable(name: string, value: any) {
   if (value === undefined) {
     delete process.env[ENV_PREFIX + name];

tests/legacy-cli/e2e_runner.ts

@@ -3,7 +3,7 @@ import { createConsoleLogger } from '../../packages/angular_devkit/core/node';
 import colors from 'ansi-colors';
 import glob from 'fast-glob';
 import * as path from 'node:path';
-import { getGlobalVariable, setGlobalVariable } from './e2e/utils/env';
+import { getGlobalVariable, registryAddr, setGlobalVariable } from './e2e/utils/env';
 import { gitClean } from './e2e/utils/git';
 import { createNpmRegistry } from './e2e/utils/registry';
 import { launchTestProcess } from './e2e/utils/process';
@@ -227,8 +227,8 @@ const ports = (async () => {
 
 Promise.all([ports, findPackageTars()])
   .then(async ([[httpPort, httpsPort], packageTars]) => {
-    setGlobalVariable('package-registry', 'http://127.0.0.1:' + httpPort);
-    setGlobalVariable('package-secure-registry', 'http://127.0.0.1:' + httpsPort);
+    setGlobalVariable('package-registry', `http://${registryAddr}:${httpPort}`);
+    setGlobalVariable('package-secure-registry', `http://${registryAddr}:${httpsPort}`);
     setGlobalVariable('package-tars', packageTars);
 
     // NPM registries for the lifetime of the test execution

tests/legacy-cli/verdaccio.yaml

@@ -3,7 +3,7 @@ storage: ./storage
 auth:
   auth-memory:
     users: {}
-listen: 127.0.0.1:${HTTP_PORT}
+listen: 0.0.0.0:${HTTP_PORT}
 uplinks:
   npmjs:
     url: https://registry.npmjs.org/

tests/legacy-cli/verdaccio_auth.yaml

@@ -5,7 +5,7 @@ auth:
       testing:
         name: testing
         password: s3cret
-listen: 127.0.0.1:${HTTPS_PORT}
+listen: 0.0.0.0:${HTTPS_PORT}
 uplinks:
   local:
     url: http://127.0.0.1:${HTTP_PORT}