From 81392b20cf42f1a58cbe7c4bdf8024e7e415f4a3 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Mon, 15 May 2023 19:40:09 -0700 Subject: [PATCH] update concurrency --- .github/workflows/build_initial.yml | 2 +- .github/workflows/build_reusable.yml | 2 +- run-tests.js | 2 +- test/e2e/app-dir/asset-prefix/asset-prefix.test.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_initial.yml b/.github/workflows/build_initial.yml index 7b207206d9229..057432c379e68 100644 --- a/.github/workflows/build_initial.yml +++ b/.github/workflows/build_initial.yml @@ -15,7 +15,7 @@ env: PNPM_VERSION: 7.24.3 NODE_MAINTENANCE_VERSION: 16 NODE_LTS_VERSION: 18 - TEST_CONCURRENCY: 6 + TEST_CONCURRENCY: 10 # TODO: remove after testing NEXT_TEST_CONTINUE_ON_ERROR: 'true' diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml index b714b848a0798..25aebb6df206a 100644 --- a/.github/workflows/build_reusable.yml +++ b/.github/workflows/build_reusable.yml @@ -15,7 +15,7 @@ env: PNPM_VERSION: 7.24.3 NODE_MAINTENANCE_VERSION: 16 NODE_LTS_VERSION: 18 - TEST_CONCURRENCY: 8 + TEST_CONCURRENCY: 10 # TODO: remove after testing NEXT_TEST_CONTINUE_ON_ERROR: 'true' diff --git a/run-tests.js b/run-tests.js index 9688f4fb3cd2c..12c45f76b0084 100644 --- a/run-tests.js +++ b/run-tests.js @@ -360,7 +360,7 @@ async function main() { } ) const handleOutput = (type) => (chunk) => { - if (hideOutput && !isFinalRun) { + if (hideOutput) { outputChunks.push({ type, chunk }) } else { process.stderr.write(chunk) diff --git a/test/e2e/app-dir/asset-prefix/asset-prefix.test.ts b/test/e2e/app-dir/asset-prefix/asset-prefix.test.ts index fa671f4f39e57..baf185f68fc75 100644 --- a/test/e2e/app-dir/asset-prefix/asset-prefix.test.ts +++ b/test/e2e/app-dir/asset-prefix/asset-prefix.test.ts @@ -12,7 +12,7 @@ createNextDescribe( redirect: 'manual', }) expect(res.status).toBe(308) - expect(res.headers.get('location')).toBe(next.url + '/a') + expect(new URL(res.headers.get('location'), next.url).pathname).toBe('/a') }) it('should render link', async () => {