diff --git a/core/src/dird/ua_prune.cc b/core/src/dird/ua_prune.cc index 683edbeed82..75a7db738bf 100644 --- a/core/src/dird/ua_prune.cc +++ b/core/src/dird/ua_prune.cc @@ -866,10 +866,12 @@ bool PruneVolume(UaContext* ua, MediaDbRecord* mr) if (!VolumeIsNowEmtpy) { Jmsg(ua->jcr, M_INFO, 0, - _("Volume \"%s\" still contains jobs after pruning.\n")); + _("Volume \"%s\" still contains jobs after pruning.\n"), + mr->VolumeName); } else { Jmsg(ua->jcr, M_INFO, 0, - _("Volume \"%s\" contains no jobs after pruning.\n")); + _("Volume \"%s\" contains no jobs after pruning.\n"), + mr->VolumeName); } } diff --git a/systemtests/tests/volume-pruning/testrunner b/systemtests/tests/volume-pruning/testrunner index 5f49531a808..8774c5dd026 100755 --- a/systemtests/tests/volume-pruning/testrunner +++ b/systemtests/tests/volume-pruning/testrunner @@ -58,6 +58,14 @@ restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all yes wait messages + +@$out $tmp/log2.out +@# +@# now prune using the commandline +@# +@sleep 6 +prune volume=TestVolume001 yes +messages quit END_OF_DATA @@ -67,6 +75,15 @@ stop_bareos check_two_logs -grep "Purging the following JobIds: 1,2,3,4,5,6" "$tmp"/log1.out || estat=1 +if ! grep "Purging the following JobIds: 1,2,3,4,5,6" "$tmp"/log1.out; then + echo "Pruned jobs don't match expectations." >&2 + estat=1 +fi + +if ! grep -F 'Volume "TestVolume001" contains no jobs after pruning.' \ + $tmp/log2.out; then + echo "Pruning message is wrong." >&2 + estat=1 +fi end_test