Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / auto-label-test

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 247f30303c8c21304e3c4dd809aa5c51780f0780..2de6f101cc9a8ada84c19f5c920ff0f92fc87c76 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -9,7 +9,7 @@ JobName=AutoLabel
 
 copy_test_confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 sed "s%# Label Format%  Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
@@ -17,10 +17,10 @@ sed "s%# Label Format%  Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_SCRIPT >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_SCRIPT >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 status all
 status all
 list pools
@@ -30,11 +30,18 @@ run job=$JobName storage=File yes
 list pools
 list volumes
 wait
+sql
+SELECT StartTime, JobFiles, JobId, Level, count(*) AS nb_jobmedia  
+FROM JobMedia join Job using (JobId) join Client using (ClientId) 
+where Client.Name = 'localhost-fd' group by JobId, Level, StartTime, 
+JobFiles order by JobId desc ;
+
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+@#setdebug level=400 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -51,7 +58,6 @@ done
 yes
 wait
 messages
-@$out
 quit
 END_OF_SCRIPT