dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Services: Convert PasswordReset's static to a const now HHVM is gone
[lhc/web/wiklou.git]
/
tests
/
selenium
/
selenium.sh
diff --git
a/tests/selenium/selenium.sh
b/tests/selenium/selenium.sh
index
4a5c254
..
f6bb944
100755
(executable)
--- a/
tests/selenium/selenium.sh
+++ b/
tests/selenium/selenium.sh
@@
-3,10
+3,13
@@
set -euo pipefail
# Check the command before running in background so
# that it can actually fail and have a descriptive error
hash chromedriver
# Check the command before running in background so
# that it can actually fail and have a descriptive error
hash chromedriver
-chromedriver --url-base=/wd/hub --port=4444 &
+chromedriver --url-base=wd/hub --port=4444 &
+CHROME_DRIVER_PID=$!
+echo chromedriver running with PID $CHROME_DRIVER_PID
# Make sure it is killed to prevent file descriptors leak
function kill_chromedriver() {
# Make sure it is killed to prevent file descriptors leak
function kill_chromedriver() {
- killall chromedriver > /dev/null
+ # Use kill instead of killall to increase chances of this working on Windows
+ kill $CHROME_DRIVER_PID > /dev/null
}
trap kill_chromedriver EXIT
npm run selenium-test
}
trap kill_chromedriver EXIT
npm run selenium-test