From 846e0424a7306a1917391ecc438b99661825fb41 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Mon, 4 Dec 2023 17:04:58 +0100 Subject: [PATCH] Updates for end-to-end testing --- playwright.config.js | 4 +++- sh/test-e2e-all.sh | 3 ++- sh/test-e2e.sh | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/playwright.config.js b/playwright.config.js index 2ce425a2f4..e59eed451f 100644 --- a/playwright.config.js +++ b/playwright.config.js @@ -43,7 +43,9 @@ module.exports = defineConfig({ /* Reporter to use. See https://playwright.dev/docs/test-reporters */ reporter : [ - ['html', { outputFolder : 'results/playwright-report' }], + ['html', process.env.E2E_TEST_SERVER + ? { open : 'never' } + : { outputFolder : 'results/playwright-report' }], ['junit', { outputFile : process.env.TEST_NUM ? `results/end-to-end-${process.env.TEST_NUM}-results.xml` diff --git a/sh/test-e2e-all.sh b/sh/test-e2e-all.sh index 0aa21278d0..32922c822e 100755 --- a/sh/test-e2e-all.sh +++ b/sh/test-e2e-all.sh @@ -1,7 +1,8 @@ #!/bin/bash # bash strict mode -set -eo pipefail +set +e +set -o pipefail # Make sure results directory exists if [[ ! -d results ]]; then diff --git a/sh/test-e2e.sh b/sh/test-e2e.sh index 91aa4795bc..060e0772e4 100755 --- a/sh/test-e2e.sh +++ b/sh/test-e2e.sh @@ -7,7 +7,8 @@ echo "===============================================" echo "" # bash script mode -set -euo pipefail +set +e +set -o pipefail # Make sure results directory exists if [[ ! -d results ]]; then