kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Add --test-timeout option to runTestsuite.sh

Browse Source 
The default is 600 seconds.
Also added timeouts to the *TestGroups.json files.

Change-Id: I8ab6a69e704b6a10f06a0e52ede02312a2b72fe0
This commit is contained in:
George Joseph
2018-09-26 07:12:28 -06:00
parent de14ed0b93
commit 950d0b65e5
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/CI/gateTestGroups.json
View File

@@ -2,46 +2,55 @@
{ {
"name": "ari1", "name": "ari1",
"dir": "tests/CI/output/ari1", "dir": "tests/CI/output/ari1",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "--test-regex=tests/rest_api/[Ca-d]" "testcmd": "--test-regex=tests/rest_api/[Ca-d]"
}, },
{ {
"name": "ari2", "name": "ari2",
"dir": "tests/CI/output/ari2", "dir": "tests/CI/output/ari2",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "--test-regex=tests/rest_api/[e-z]" "testcmd": "--test-regex=tests/rest_api/[e-z]"
}, },
{ {
"name": "pjs1", "name": "pjs1",
"dir": "tests/CI/output/pjsip1", "dir": "tests/CI/output/pjsip1",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "--test-regex=tests/channels/pjsip/[a-f]" "testcmd": "--test-regex=tests/channels/pjsip/[a-f]"
}, },
{ {
"name": "pjs2", "name": "pjs2",
"dir": "tests/CI/output/pjsip2", "dir": "tests/CI/output/pjsip2",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "--test-regex=tests/channels/pjsip/[g-r]" "testcmd": "--test-regex=tests/channels/pjsip/[g-r]"
}, },
{ {
"name": "pjs3", "name": "pjs3",
"dir": "tests/CI/output/pjsip3", "dir": "tests/CI/output/pjsip3",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "--test-regex=tests/channels/pjsip/[s-z]" "testcmd": "--test-regex=tests/channels/pjsip/[s-z]"
}, },
{ {
"name": "sip1", "name": "sip1",
"dir": "tests/CI/output/sip1", "dir": "tests/CI/output/sip1",
"runTestsuiteOptions": "--test-timeout=240",
"testcmd": "--test-regex=tests/channels/SIP/[Sa-r]" "testcmd": "--test-regex=tests/channels/SIP/[Sa-r]"
}, },
{ {
"name": "sip2", "name": "sip2",
"dir": "tests/CI/output/sip2", "dir": "tests/CI/output/sip2",
"runTestsuiteOptions": "--test-timeout=240",
"testcmd": "--test-regex=tests/channels/SIP/[s-z]" "testcmd": "--test-regex=tests/channels/SIP/[s-z]"
}, },
{ {
"name": "iax ", "name": "iax ",
"dir": "tests/CI/output/iax2_local", "dir": "tests/CI/output/iax2_local",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": " -t tests/channels/iax2 -t tests/channels/local" "testcmd": " -t tests/channels/iax2 -t tests/channels/local"
}, },
{ {
"name": "mwi ", "name": "mwi ",
"dir": "tests/CI/output/extmwi", "dir": "tests/CI/output/extmwi",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "--test-regex=tests/channels/pjsip/.*mwi" "testcmd": "--test-regex=tests/channels/pjsip/.*mwi"
} }
] ]

8
tests/CI/periodic-dailyTestGroups.json
View File

@@ -2,37 +2,43 @@
{ {
"name": "ari ", "name": "ari ",
"dir": "tests/CI/output/ari", "dir": "tests/CI/output/ari",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "-t tests/rest_api/" "testcmd": "-t tests/rest_api/"
}, },
{ {
"name": "pjs ", "name": "pjs ",
"dir": "tests/CI/output/pjsip", "dir": "tests/CI/output/pjsip",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": "-t tests/channels/pjsip" "testcmd": "-t tests/channels/pjsip"
}, },
{ {
"name": "sip ", "name": "sip ",
"dir": "tests/CI/output/sip", "dir": "tests/CI/output/sip",
"runTestsuiteOptions": "--test-timeout=240",
"testcmd": "-t tests/channels/SIP" "testcmd": "-t tests/channels/SIP"
}, },
{ {
"name": "iax ", "name": "iax ",
"dir": "tests/CI/output/iax2_local", "dir": "tests/CI/output/iax2_local",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": " -t tests/channels/iax2 -t tests/channels/local" "testcmd": " -t tests/channels/iax2 -t tests/channels/local"
}, },
{ {
"name": "apps", "name": "apps",
"dir": "tests/CI/output/agi-apps", "dir": "tests/CI/output/agi-apps",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": " -t tests/agi -t tests/apps -t blind-transfer-parkingtimeout" "testcmd": " -t tests/agi -t tests/apps -t blind-transfer-parkingtimeout"
}, },
{ {
"name": "othr", "name": "othr",
"dir": "tests/CI/output/other", "dir": "tests/CI/output/other",
"runTestsuiteOptions": "--test-timeout=180",
"testcmd": " -T tests/(apps|agi|blind-transfer-parkingtimeout|rest_api|channels|realtime|example|skeleton_test|remote-test)" "testcmd": " -T tests/(apps|agi|blind-transfer-parkingtimeout|rest_api|channels|realtime|example|skeleton_test|remote-test)"
}, },
{ {
"name": "real", "name": "real",
"dir": "tests/CI/output/realtime", "dir": "tests/CI/output/realtime",
"runTestsuiteOptions": "--realtime --initialize-db --cleanup-db", "runTestsuiteOptions": "--test-timeout=180 --realtime --initialize-db --cleanup-db",
"testcmd": " -t tests/channels/pjsip -G realtime-incompatible" "testcmd": " -t tests/channels/pjsip -G realtime-incompatible"
} }
] ]

3
tests/CI/runTestsuite.sh
View File

@@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
CIDIR=$(dirname $(readlink -fn $0)) CIDIR=$(dirname $(readlink -fn $0))
REALTIME=0 REALTIME=0
TEST_TIMEOUT=600
source $CIDIR/ci.functions source $CIDIR/ci.functions
ASTETCDIR=$DESTDIR/etc/asterisk ASTETCDIR=$DESTDIR/etc/asterisk
@@ -14,7 +15,7 @@ fi
export PYTHONPATH=./lib/python/ export PYTHONPATH=./lib/python/
echo "Running tests ${TESTSUITE_COMMAND}" echo "Running tests ${TESTSUITE_COMMAND}"
./runtests.py --cleanup ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || : ./runtests.py --cleanup --timeout=${TEST_TIMEOUT} ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :
if [ $REALTIME -eq 1 ] ; then if [ $REALTIME -eq 1 ] ; then
$CIDIR/teardownRealtime.sh --cleanup-db=${CLEANUP_DB:?0} $CIDIR/teardownRealtime.sh --cleanup-db=${CLEANUP_DB:?0}