Skip to content

Commit d3f385a

Browse files
committed
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 <[email protected]>
1 parent b66b98e commit d3f385a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/test/cli-integration/rbd/iscsi_client.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Login to the target
22
===================
33
$ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $3}'`
4-
> sudo iscsiadm -m discovery -t st -p $IP -l 2&> /dev/null
4+
$ sudo iscsiadm -m discovery -t st -p $IP -l >/dev/null 2>&1
55
$ sleep 10
66
$ sudo ls /dev/disk/by-path/ |grep 'iscsi-iqn.2003-01.com.redhat.iscsi-gw:ceph-gw' |wc -l
77
2

0 commit comments

Comments
 (0)