From: Ilya Dryomov Date: Thu, 26 Sep 2024 15:36:37 +0000 (+0200) Subject: qa: avoid a non-standard shell construct in rbd/iscsi_client.t X-Git-Tag: v19.2.1~178^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0dfe9303344823de0cc9768fd9ad323ed6d40db5;p=ceph.git qa: avoid a non-standard shell construct in rbd/iscsi_client.t dash which is used as /bin/sh on Ubuntu interprets "2&> /dev/null" as an instruction to launch iscsiadm in the background. While that is mostly compensated by the following sleep, stderr isn't redirected to /dev/null either -- the output gets polluted and the test fails. Signed-off-by: Ilya Dryomov (cherry picked from commit d3f385aaed0b7631f6d69bf1ed88f9570b1d8f50) --- diff --git a/src/test/cli-integration/rbd/iscsi_client.t b/src/test/cli-integration/rbd/iscsi_client.t index f636d540d897d..9a659e49eca68 100644 --- a/src/test/cli-integration/rbd/iscsi_client.t +++ b/src/test/cli-integration/rbd/iscsi_client.t @@ -1,7 +1,7 @@ Login to the target =================== $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $3}'` - > sudo iscsiadm -m discovery -t st -p $IP -l 2&> /dev/null + $ sudo iscsiadm -m discovery -t st -p $IP -l >/dev/null 2>&1 $ sleep 10 $ sudo ls /dev/disk/by-path/ |grep 'iscsi-iqn.2003-01.com.redhat.iscsi-gw:ceph-gw' |wc -l 2