Skip to content

Commit

Permalink
Merge pull request ngageoint#946 in WV/opensphere from ~DENTONJ/opens…
Browse files Browse the repository at this point in the history
…phere:CATS-91 to master

* commit '91aa351f3b36c1659cec7866c9239def481dfcc6':
  test(cypress): fixes automatic termination of webserver under Windows
  • Loading branch information
justin-bits committed Sep 23, 2019
2 parents a0836c6 + 91aa351 commit 6943b2c
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions cypress/support/execute-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,7 @@ function runTests() {
function stopWebServer() {
if $SERVER_STARTED; then
echo 'INFO: terminating web server'
if [ "$OSTYPE" == "msys" ]; then
webServerProcess="$(netstat -ano | findstr 0.0.0.0:8282 | awk '{print $5}')" # TODO: Use a process name instead after this is fixed: https://github.com/http-party/http-server/issues/333
if [ $webServerProcess ]; then
taskkill //PID $webServerProcess //F
fi
else
npm run stop-server
fi
npm run stop-server
else
echo 'INFO: server was running before tests started, leaving it running'
fi
Expand Down

0 comments on commit 6943b2c

Please sign in to comment.