Skip to content

Commit 4bfd86e

Browse files
Copilothotlong
andcommitted
Address security concerns and improve test reliability
Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>
1 parent 209cea9 commit 4bfd86e

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

.github/workflows/test-lifecycle.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup pnpm
2525
uses: pnpm/action-setup@v4
2626
with:
27-
version: 10
27+
version: '10.x'
2828

2929
- name: Install dependencies
3030
run: pnpm install
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/upload-artifact@v4
3838
with:
3939
name: quick-test-results
40-
path: /tmp/test-*.log
40+
path: /tmp/objectdocs-*.log
4141
retention-days: 7
4242
if-no-files-found: ignore
4343

@@ -57,7 +57,7 @@ jobs:
5757
- name: Setup pnpm
5858
uses: pnpm/action-setup@v4
5959
with:
60-
version: 10
60+
version: '10.x'
6161

6262
- name: Install dependencies
6363
run: pnpm install
@@ -70,8 +70,6 @@ jobs:
7070
uses: actions/upload-artifact@v4
7171
with:
7272
name: full-test-results
73-
path: |
74-
/tmp/dev-server.log
75-
/tmp/start-server.log
73+
path: /tmp/objectdocs-*.log
7674
retention-days: 7
7775
if-no-files-found: ignore

test-quick.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ print_error() {
2525
echo -e "${RED}${NC} $1"
2626
}
2727

28-
TEST_DIR="/tmp/objectdocs-quick-test-$(date +%s)"
28+
TEST_DIR=$(mktemp -d -t objectdocs-quick-test.XXXXXXXXXX)
2929

3030
# Cleanup on exit
3131
cleanup() {

test-site.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ BLUE='\033[0;34m'
1313
NC='\033[0m' # No Color
1414

1515
# Configuration
16-
TEST_DIR="/tmp/objectdocs-test-$(date +%s)"
17-
LOG_DIR="/tmp/objectdocs-logs-$(date +%s)"
18-
PORT=7777
19-
BUILD_TIMEOUT=300 # 5 minutes for build
20-
DEV_TIMEOUT=30 # 30 seconds for dev server to start
16+
TEST_DIR=$(mktemp -d -t objectdocs-test.XXXXXXXXXX)
17+
LOG_DIR=$(mktemp -d -t objectdocs-logs.XXXXXXXXXX)
18+
PORT="${PORT:-7777}" # Allow override via environment variable
19+
BUILD_TIMEOUT="${BUILD_TIMEOUT:-300}" # 5 minutes for build
20+
DEV_TIMEOUT="${DEV_TIMEOUT:-30}" # 30 seconds for dev server to start
2121

2222
# Cleanup function
2323
cleanup() {
@@ -37,9 +37,13 @@ cleanup() {
3737
fi
3838

3939
# Kill any process using the test port (gracefully)
40-
lsof -ti:$PORT | xargs kill 2>/dev/null || true
41-
sleep 1
42-
lsof -ti:$PORT | xargs kill -9 2>/dev/null || true
40+
if lsof -ti:$PORT >/dev/null 2>&1; then
41+
lsof -ti:$PORT | xargs kill 2>/dev/null || true
42+
sleep 1
43+
if lsof -ti:$PORT >/dev/null 2>&1; then
44+
lsof -ti:$PORT | xargs kill -9 2>/dev/null || true
45+
fi
46+
fi
4347

4448
# Remove test directory (force recursive delete)
4549
if [ -d "$TEST_DIR" ]; then

0 commit comments

Comments
 (0)