BEE Backport regress/tests/multi2-storage-test

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Tue Mar 5 10:35:10 2019 +0100

    regress: Fix tests for ubuntu

diff --git a/regress/tests/multi2-storage-test b/regress/tests/multi2-storage-test
index a944a077d577ec1ab3d0f7253607da6ce4390c1f..9865ee9a8aad0f9cf596648547449b3fdd9c7861 100755 (executable)
--- a/regress/tests/multi2-storage-test
+++ b/regress/tests/multi2-storage-test
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # This script uses the virtual disk autochanger
 #
@@ -55,14 +53,14 @@ start_test
 
 # Stop SDs
 for sd in 2 3 4; do
-  $tmp/bacula-ctl-sd$sd stop &> /dev/null
+  $tmp/bacula-ctl-sd$sd stop > /dev/null 2> /dev/null
 done
 
 sleep 2
 
 # Start SDs
 for sd in 2 3 4; do
-  $tmp/bacula-ctl-sd$sd start &> /dev/null
+  $tmp/bacula-ctl-sd$sd start > /dev/null 2> /dev/null
 done
 
 # Write out bconsole commands
@@ -184,7 +182,7 @@ check_for_zombie_jobs storage=tape
 
 stop_bacula
 for sd in 2 3 4; do
-  $tmp/bacula-ctl-sd$sd stop &> /dev/null
+  $tmp/bacula-ctl-sd$sd stop > /dev/null 2> /dev/null
 done
 
 # we have two restore to test