Commit 742f04b3 authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

check_format: Fixes for shellcheck's SC2251 directive 



SC2251: This ! is not on a condition and skips errexit.
        Use && exit 1 instead, or make sure $? is checked.

This is critical since our test suites heavily depend on errexit
to catch all abnormal conditions. Replace ! foo ... with a call to
NOT() wherever possible. For the test/ocf pieces, use [[ ]] instead
to define the condition for the existance of the ocf bdev.

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: Ied3f99b9f1dc0594e4aef64fc21e51498f19ac23
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8504


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 9d486621

test/iscsi_tgt/rpc_config/rpc_config.sh

+2 −2
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ $rpc_py framework_start_init 
echo "iscsi_tgt is listening. Running tests..."



# RPC framework_wait_init should be already returned, so its process must be non-existed

! ps $rpc_wait_pid

NOT ps $rpc_wait_pid



# RPC framework_wait_init will directly returned after subsystem initialized.

$rpc_py framework_wait_init &

rpc_wait_pid=$!

sleep 1

! ps $rpc_wait_pid

NOT ps $rpc_wait_pid



timing_exit start_iscsi_tgt

test/nvmf/target/rpc.sh

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $rpc_py nvmf_subsystem_allow_any_host -d nqn.2016-06.io.spdk:cnode1 
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



# This connect should fail - the host NQN is not allowed

! nvme connect -t $TEST_TRANSPORT -n nqn.2016-06.io.spdk:cnode1 -q nqn.2016-06.io.spdk:host1 -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"

NOT nvme connect -t $TEST_TRANSPORT -n nqn.2016-06.io.spdk:cnode1 -q nqn.2016-06.io.spdk:host1 -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"



# Add the host NQN and verify that the connect succeeds

$rpc_py nvmf_subsystem_add_host nqn.2016-06.io.spdk:cnode1 nqn.2016-06.io.spdk:host1
@@ -69,7 +69,7 @@ nvme disconnect -n nqn.2016-06.io.spdk:cnode1 


# Remove the host and verify that the connect fails

$rpc_py nvmf_subsystem_remove_host nqn.2016-06.io.spdk:cnode1 nqn.2016-06.io.spdk:host1

! nvme connect -t $TEST_TRANSPORT -n nqn.2016-06.io.spdk:cnode1 -q nqn.2016-06.io.spdk:host1 -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"

NOT nvme connect -t $TEST_TRANSPORT -n nqn.2016-06.io.spdk:cnode1 -q nqn.2016-06.io.spdk:host1 -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"



# Allow any host and verify that the connect succeeds

$rpc_py nvmf_subsystem_allow_any_host -e nqn.2016-06.io.spdk:cnode1

test/ocf/management/remove.sh

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ $rpc_py bdev_ocf_delete ocfWT 


# Check that ocfWT was deleted properly



! $rpc_py bdev_ocf_get_bdevs | jq -r '.[] .name' | grep -qw ocfWT

[[ -z $("$rpc_py" bdev_ocf_get_bdevs | jq -r '.[] | select(.name == "ocfWT") | .name') ]]



trap - SIGINT SIGTERM EXIT
@@ -76,7 +76,7 @@ waitforlisten $spdk_pid 


# Check that ocfWT was not loaded on app start



! $rpc_py bdev_ocf_get_bdevs | jq -r '.[] .name' | grep -qw ocfWT

[[ -z $("$rpc_py" bdev_ocf_get_bdevs | jq -r '.[] | select(name == "ocfWT") | .name') ]]



trap - SIGINT SIGTERM EXIT