From cc0b19de83909ac6ced03fa2199ae3a9243d971b Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Fri, 19 Jan 2024 14:03:52 +0000
Subject: [PATCH] chore: improve run-e2e-tests.sh
- tune curl timeout
- fix stopping server issue
Refs #647
---
package.json | 2 +-
scripts/{run_e2e-tests.sh => run-e2e-tests.sh} | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
rename scripts/{run_e2e-tests.sh => run-e2e-tests.sh} (69%)
diff --git a/package.json b/package.json
index 97f735508..a0c309036 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"ng": "cd . && \"node_modules/.bin/ng\"",
"postinstall": "./node_modules/.bin/webdriver-manager update --gecko=false --versions.chrome=107.0.5304.110",
"lint": "eslint -c .eslintrc.js --ext .ts src",
- "e2e": "bash scripts/run_e2e-tests.sh",
+ "e2e": "bash scripts/run-e2e-tests.sh",
"e2equick": "./node_modules/.bin/wdio run ./wdio.conf.ts",
"monkeytest": "npm run ng -- e2e --dev-server-target= --suite=monkeyTest --webdriver-update=false",
"mkdocs": "bash scripts/prepare_mkdocs.sh; cd build; python3 -m mkdocs build -f mkdocs-fr.yml && python3 -m mkdocs build -f mkdocs-en.yml && cd .. && node scripts/mkdocs-postprocess.js",
diff --git a/scripts/run_e2e-tests.sh b/scripts/run-e2e-tests.sh
similarity index 69%
rename from scripts/run_e2e-tests.sh
rename to scripts/run-e2e-tests.sh
index 647c64bb3..e30e40a55 100644
--- a/scripts/run_e2e-tests.sh
+++ b/scripts/run-e2e-tests.sh
@@ -7,19 +7,19 @@
npm start &
NG_SERVE_PID=$!
-echo "**************************************************************************"
-echo "Just in case... Use kill -9 -${NG_SERVE_PID} to kill the server if something goes wrong"
-echo "**************************************************************************"
-
# Wait for http response 200 on port 4200
response=0
while [ "$response" != "200" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null 127.0.0.1:4200 || echo 0)
+ response=$(curl --connect-timeout 5 --write-out '%{http_code}' --silent --output /dev/null 127.0.0.1:4200 || echo 0)
sleep 5;
done
+echo "**************************************************************************"
+echo "If something goes wrong, use 'pkill ng', to kill the server"
+echo "**************************************************************************"
+
# Run wdio
npm run e2equick
# Cleanup daemon processes
-kill -9 -$NG_SERVE_PID
+pkill ng
--
GitLab