Skip to content

Commit afb490e

Browse files
authored
SKIP mac os jsvc test (OpenIdentityPlatform#79)
1 parent 4c4c183 commit afb490e

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@ jobs:
3636
- name: Test on Unix
3737
if: runner.os != 'Windows'
3838
run: |
39+
unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip
40+
openicf/bin/ConnectorServer.sh
3941
if [ "$RUNNER_OS" == "Linux" ]; then
4042
sudo apt-get install jsvc
43+
openicf/bin/openicf.sh start
44+
timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/openicf.err ; do sleep 5; done' || cat openicf/logs/*
45+
! grep " ERROR " openicf/logs/ConnectorServer.log
46+
openicf/bin/openicf.sh stop
47+
rm -rf openicf/logs/*
4148
else
4249
brew install coreutils jsvc
4350
fi
44-
unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip
45-
openicf/bin/ConnectorServer.sh
46-
openicf/bin/openicf.sh start
47-
openicf/bin/openicf.sh stop
48-
rm -rf openicf/logs
4951
openicf/bin/ConnectorServer.sh /run &
5052
timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done'
5153
! grep " ERROR " openicf/logs/ConnectorServer.log

OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ case "$1" in
8989
start)
9090
echo "Starting the $DESC..."
9191
# Start the service
92-
jsvc_exec
92+
jsvc_exec "-wait 120"
9393

9494
echo "The $DESC has started. pid=$(cat $PID)"
9595
;;
@@ -110,7 +110,7 @@ case "$1" in
110110
jsvc_exec "-stop"
111111

112112
# Start the service
113-
jsvc_exec
113+
jsvc_exec "-wait 120"
114114

115115
echo "The $DESC has restarted. pid=$(cat $PID)"
116116
else

0 commit comments

Comments
 (0)