Skip to content

Commit

Permalink
Set test timeout to 1h. v5.12.15
Browse files Browse the repository at this point in the history
  • Loading branch information
@winlinvip
winlinvip committed Dec 12, 2023
1 parent bc79a51 commit 804a49b
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 57 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/pullrequest.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -131,19 +131,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://localhost:2443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://localhost:2443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -203,19 +203,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://localhost:2443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://localhost:2443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -293,19 +293,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://localhost:2443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://localhost:2443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down Expand Up @@ -373,7 +373,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -382,19 +382,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://localhost:2443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://localhost:2443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-online.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ jobs:
echo "Wait for service ready." &&
bash secret.sh >./test/.env &&
./test/srs-stack.test -test.v -endpoint http://$SRS_DOMAIN.ossrs.io \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://$SRS_DOMAIN.ossrs.io \
-srs-log=true -wait-ready=true -init-password=true -check-api-secret=true -init-self-signed-cert=true \
-test.run TestSystem_Empty -no-bilibili-test=true &&
Expand All @@ -301,32 +301,32 @@ jobs:
echo "Test HTTP API with self-signed cert." &&
bash secret.sh >./test/.env &&
./test/srs-stack.test -test.v -wait-ready -endpoint http://$SRS_DOMAIN.ossrs.io \
./test/srs-stack.test -test.timeout=1h -test.v -wait-ready -endpoint http://$SRS_DOMAIN.ossrs.io \
-srs-log=true -wait-ready=true -init-password=false -check-api-secret=true -no-media-test \
-no-bilibili-test=true &&
echo "Test HTTPS API with self-signed cert." &&
bash secret.sh >./test/.env &&
./test/srs-stack.test -test.v -wait-ready -endpoint https://$SRS_DOMAIN.ossrs.io \
./test/srs-stack.test -test.timeout=1h -test.v -wait-ready -endpoint https://$SRS_DOMAIN.ossrs.io \
-srs-log=true -wait-ready=true -init-password=false -check-api-secret=true -no-media-test \
-no-bilibili-test=true &&
echo "Request CERT from letsencrypt." &&
bash secret.sh >./test/.env &&
./test/srs-stack.test -test.v -endpoint http://$SRS_DOMAIN.ossrs.io \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://$SRS_DOMAIN.ossrs.io \
-srs-log=true -wait-ready=true -init-password=false -check-api-secret=true -domain-lets-encrypt=$SRS_DOMAIN.ossrs.io \
-test.run TestApi_LetsEncryptUpdateCert -no-media-test \
-no-bilibili-test=true &&
echo "Test HTTPS API with letsencrypt cert." &&
bash secret.sh >./test/.env &&
./test/srs-stack.test -test.v -wait-ready -endpoint https://$SRS_DOMAIN.ossrs.io \
./test/srs-stack.test -test.timeout=1h -test.v -wait-ready -endpoint https://$SRS_DOMAIN.ossrs.io \
-srs-log=true -wait-ready=true -init-password=false -check-api-secret=true -https-insecure-verify \
-no-media-test -no-bilibili-test=true &&
echo "Run media test with retry" &&
bash secret.sh >./test/.env &&
./failed-retry.sh 5 ./test/srs-stack.test -test.v -wait-ready -endpoint http://$SRS_DOMAIN.ossrs.io \
./failed-retry.sh 5 ./test/srs-stack.test -test.timeout=1h -test.v -wait-ready -endpoint http://$SRS_DOMAIN.ossrs.io \
-srs-log=true -wait-ready=true -init-password=false -check-api-secret=true -test.run WithStream \
-no-bilibili-test=true
ret=$?; echo "Test result: $ret"
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -100,19 +100,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://localhost:2443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://localhost:2443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://localhost:2022 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://localhost:2022 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down Expand Up @@ -259,7 +259,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://srs.stack.local:80 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://srs.stack.local:80 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -268,19 +268,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://srs.stack.local:80 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://srs.stack.local:80 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://srs.stack.local:443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://srs.stack.local:443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://srs.stack.local:80 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://srs.stack.local:80 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down Expand Up @@ -424,7 +424,7 @@ jobs:
echo "Wait for service ready." &&
make -j -C test &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://srs.stack.local:80 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://srs.stack.local:80 \
-srs-log=true -wait-ready=true -init-password=true -init-self-signed-cert=true \
-check-api-secret=true -test.run TestSystem_Empty &&
Expand All @@ -433,19 +433,19 @@ jobs:
echo "Test HTTP service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint http://srs.stack.local:80 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://srs.stack.local:80 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Test HTTPS service." &&
bash scripts/tools/secret.sh --output test/.env &&
./test/srs-stack.test -test.v -endpoint https://srs.stack.local:443 \
./test/srs-stack.test -test.timeout=1h -test.v -endpoint https://srs.stack.local:443 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -no-media-test &&
echo "Run media test with retry" &&
bash scripts/tools/secret.sh --output test/.env &&
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.v -endpoint http://srs.stack.local:80 \
./scripts/tools/failed-retry.sh 1 ./test/srs-stack.test -test.timeout=1h -test.v -endpoint http://srs.stack.local:80 \
-srs-log=true -wait-ready=true -init-password=false -init-self-signed-cert=false \
-check-api-secret=true -test.run WithStream
ret=$?; echo "Test result: $ret"
Expand Down
Loading

0 comments on commit 804a49b

Please sign in to comment.