X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fnext-vol-test;h=5ce035252c3d51ef8d558239b26fc42284581d0b;hb=576f41b2d1830dc7de53214e2fcf2365244f0531;hp=739d160dedcf9d775ff29e4b5551fa14069ba787;hpb=e0d3d33cac13399633f02344164a3f300e1c7b63;p=bacula%2Fbacula

diff --git a/regress/tests/next-vol-test b/regress/tests/next-vol-test
index 739d160ded..5ce035252c 100755
--- a/regress/tests/next-vol-test
+++ b/regress/tests/next-vol-test
@@ -54,7 +54,9 @@ update Media SET VolJobs=1 WHERE VolumeName='vol52';
 update Media SET LastWritten='2006-01-01 01:00:01' WHERE VolumeName='vol57';
 update Media SET LastWritten='2006-01-01 01:00:02' WHERE VolumeName='vol53';
 
-list volume
+list volumes
+wait
+quit
 EOF
 
 run_bacula
@@ -68,7 +70,7 @@ cat <<EOF > ${cwd}/tmp/bconcmds
 run level=full pool=Test NightlySave yes
 wait
 message
-list volume
+list volumes
 @# Must choose vol58
 @# Pool + Recycled + Enabled + InChanger
 run level=full pool=Test NightlySave yes
@@ -80,13 +82,13 @@ list volume
 run level=full pool=Test NightlySave yes
 wait
 message
-list volume
+list volumes
 @# Must choose vol55
 @# Pool + Full + Recycle + Enabled + InChanger
 run level=full pool=Test NightlySave yes
 wait
 message
-list volume
+list volumes
 @# Must choose vol54
 @# No more in Test pool, get from scratch
 @# vol52 is Append, but have 1 job and MaxJob
@@ -106,13 +108,13 @@ list volume
 run level=full pool=Test NightlySave yes
 wait
 message
-list volume
+list volumes
 @# Must choose vol53
 @# Scratch + Purged + Enabled + InChanger + LastW
 run level=full pool=Test NightlySave yes
 wait
-message
-list volume
+messages
+list volumes
 restore fileset="Full Set" pool=Test where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -124,6 +126,7 @@ messages
 @#wait
 @#message
 @#list volume
+quit
 EOF
 
 run_bconsole
@@ -252,6 +255,7 @@ run level=full pool=Test storage=File NightlySave yes
 wait
 message
 list volume
+wait
 quit
 EOF
 
@@ -299,7 +303,7 @@ if [ $? -ne 0 ]; then
    bstat=$?
 fi
 
-check_for_zombie_jobs storage=LTO3
+check_for_zombie_jobs storage=LTO3 client=${HOST}-fd
 stop_bacula
 
 check_two_logs