Commit ddc069c5 authored Mar 18, 2020 by Michal Berger Committed by Tomasz Zawadzki Apr 10, 2020

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



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>

parent 55e0ec89

test/openstack/run_openstack_tests.sh

+6 −4

Original line number	Diff line number	Diff line
		@@ -10,10 +10,12 @@ TEST_TRANSPORT='rdma'
		nvmftestinit

		function finish_test {
		$rpc_py bdev_lvol_delete_lvstore -l lvs0
		{
		"$rpc_py" bdev_lvol_delete_lvstore -l lvs0
		kill -9 $rpc_proxy_pid
		killprocess $nvmfpid
		rm $testdir/conf.json
		rm "$testdir/conf.json"
		} \|\| :
		}

		trap "finish_test" SIGINT SIGTERM EXIT