ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/openstack: Don't trigger errexit from within finish_test()

Browse Source 
If, e.g., the rpc call fails the remaining parts of the function
won't be called, resulting in lingering processes tainting the
testing environment.

Avoid the above scenario by intercepting single es from the entire
list.

Change-Id: Ie591935a3d868a1efa2890d1bb14776b0bdb6620
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1356
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Michal Berger 2020-03-18 10:30:45 +01:00 committed by Tomasz Zawadzki
parent 55e0ec894f
commit ddc069c5be
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/openstack/run_openstack_tests.sh
View File

@ -10,10 +10,12 @@ TEST_TRANSPORT='rdma'
nvmftestinit
function finish_test {
$rpc_py bdev_lvol_delete_lvstore -l lvs0
kill -9 $rpc_proxy_pid
killprocess $nvmfpid
rm $testdir/conf.json
{
"$rpc_py" bdev_lvol_delete_lvstore -l lvs0
kill -9 $rpc_proxy_pid
killprocess $nvmfpid
rm "$testdir/conf.json"
} || :
}
trap "finish_test" SIGINT SIGTERM EXIT