diff options
| author | Alexey Kodanev <alexey.kodanev@oracle.com> | 2019-02-28 15:16:16 +0300 |
|---|---|---|
| committer | Alexey Kodanev <alexey.kodanev@oracle.com> | 2019-02-28 15:52:09 +0300 |
| commit | 97fe75a91a197694b0033e14b7915601da081721 (patch) | |
| tree | aaf6560cb5e9a2d59f54c4679fbd36d87250f69e /testcases/lib | |
| parent | b980a9b3789a6a51dfb06e881eadfbb1aa3f25f2 (diff) | |
lib/tst_net.sh: don't treat TWARN/TCONF as failure in tst_netload()
Report TWARN and don't stop the test in that case.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Petr Vorel <pvorel@suse.cz>
Diffstat (limited to 'testcases/lib')
| -rw-r--r-- | testcases/lib/tst_net.sh | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index 314864321..69d196f78 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -573,7 +573,7 @@ tst_netload() [ "$setup_srchost" = 1 ] && s_opts="${s_opts}-S $hostopt " local expect_ret=0 - [ "$expect_res" != "pass" ] && expect_ret=1 + [ "$expect_res" != "pass" ] && expect_ret=3 tst_rhost_run -c "pkill -9 netstress\$" s_opts="${cs_opts}${s_opts}-R $s_replies -B $TST_TMPDIR" @@ -590,26 +590,37 @@ tst_netload() c_opts="${cs_opts}${c_opts}-a $c_num -r $c_requests -d $rfile -g $port" tst_res_ TINFO "run client 'netstress -l $c_opts'" - netstress -l $c_opts > tst_netload.log 2>&1 || ret=1 + netstress -l $c_opts > tst_netload.log 2>&1 || ret=$? tst_rhost_run -c "pkill -9 netstress\$" - if [ "$expect_ret" -ne "$ret" ]; then + if [ "$expect_ret" -ne 0 ]; then + if [ $((ret & expect_ret)) -ne 0 ]; then + tst_res_ TPASS "netstress failed as expected" + else + tst_res_ TFAIL "expected '$expect_res' but ret: '$ret'" + fi + return $ret + fi + + if [ "$ret" -ne 0 ]; then tst_dump_rhost_cmd cat tst_netload.log - tst_brk_ TFAIL "expected '$expect_res' but ret: '$ret'" + [ $((ret & 3)) -ne 0 ] && \ + tst_brk_ TFAIL "expected '$expect_res' but ret: '$ret'" + [ $((ret & 32)) -ne 0 ] && \ + tst_brk_ TCONF "not supported configuration" + [ $((ret & 4)) -ne 0 ] && \ + tst_res_ TWARN "netstress has warnings" fi - if [ "$ret" -eq 0 ]; then - if [ ! -f $rfile ]; then - tst_dump_rhost_cmd - cat tst_netload.log - tst_brk_ TFAIL "can't read $rfile" - fi - tst_res_ TPASS "netstress passed, time spent '$(cat $rfile)' ms" - else - tst_res_ TPASS "netstress failed as expected" + if [ ! -f $rfile ]; then + tst_dump_rhost_cmd + cat tst_netload.log + tst_brk_ TFAIL "can't read $rfile" fi + tst_res_ TPASS "netstress passed, time spent '$(cat $rfile)' ms" + return $ret } |