Skip to content

Commit 243b748

Browse files
committed
fix: reenable tests and dev server leaving stray server on exit in electron
1 parent 696e640 commit 243b748

3 files changed

Lines changed: 42 additions & 8 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"build": "npm run eslint && npm run _copy-node-src-dist && npm run _build-nonopt && npm run _make-debug-dist && npm run _build-optimized && npm run _copy-dist-to-test",
3030
"serve": "http-server . -p 8080 -c-1",
3131
"_serve-tauri": "http-server . -p 8081 -c-1",
32-
"test-electron": "npm run _serve-tauri & sleep 2 && ./src-electron/node_modules/.bin/electron src-electron/main.js",
33-
"test-electron-ci": "npm run _serve-tauri & sleep 2 && ./src-electron/node_modules/.bin/electron src-electron/main.js --quit-when-done",
32+
"test-electron": "./scripts/run-with-server.sh ./src-electron/node_modules/.bin/electron src-electron/main.js",
33+
"test-electron-ci": "./scripts/run-with-server.sh ./src-electron/node_modules/.bin/electron src-electron/main.js --quit-when-done",
3434
"bumpPatchVersion": "npm --no-git-tag-version version patch",
3535
"bumpPatchVersionWithGitTag": "npm version patch",
3636
"release": "npm run build && npm run bumpPatchVersionWithGitTag"

scripts/run-with-server.sh

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
# Starts http-server, runs command, ensures cleanup on exit
3+
4+
PORT=8081
5+
SERVER_PID=""
6+
7+
cleanup() {
8+
if [ -n "$SERVER_PID" ] && kill -0 "$SERVER_PID" 2>/dev/null; then
9+
echo "Stopping http-server (PID: $SERVER_PID)..."
10+
kill "$SERVER_PID" 2>/dev/null
11+
wait "$SERVER_PID" 2>/dev/null
12+
fi
13+
# Safety net: kill any orphaned process on the port
14+
fuser -k "$PORT/tcp" 2>/dev/null || true
15+
}
16+
17+
trap cleanup EXIT INT TERM
18+
19+
# Kill any existing server on the port first
20+
fuser -k "$PORT/tcp" 2>/dev/null || true
21+
sleep 1
22+
23+
# Start http-server in background
24+
http-server . -p "$PORT" -c-1 &
25+
SERVER_PID=$!
26+
echo "Started http-server on port $PORT (PID: $SERVER_PID)"
27+
28+
sleep 2
29+
30+
# Run the provided command
31+
"$@"
32+
EXIT_CODE=$?
33+
34+
exit $EXIT_CODE

test/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@
149149
</script>
150150

151151
<script src="testInit.js"></script>
152-
<!-- <script src="test-node.browser.js"></script>-->
153-
<!-- <script src="test-dir.browser.js"></script>-->
154-
<!-- <script src="test-file.browser.js"></script>-->
155-
<!-- <script src="test-copy.browser.js"></script>-->
156-
<!-- <script src="test.worker.js"></script>-->
152+
<script src="test-node.browser.js"></script>
153+
<script src="test-dir.browser.js"></script>
154+
<script src="test-file.browser.js"></script>
155+
<script src="test-copy.browser.js"></script>
156+
<script src="test.worker.js"></script>
157157
<script src="test-getPlatformPath-api.browser.js"></script>
158-
<!-- <script src="test-watcher.browser.js"></script>-->
158+
<script src="test-watcher.browser.js"></script>
159159
<script class="mocha-exec">
160160
window.virtualTestPath = '/test-phoenix-fs';
161161

0 commit comments

Comments
 (0)