From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 2 Sep 2020 13:03:00 +0000 (+0200)
Subject: BEE Backport regress/tests/multi2-storage-test
X-Git-Tag: Release-11.3.2~1254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2b5c8ec74ebfb6dbbcd99907f74a62263464efb;p=thirdparty%2Fbacula.git

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 a944a077d5..9865ee9a8a 100755
--- 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