From a2d2ce630513924887cb36df442cd2df6c008e5b Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <marco.van.wieringen@bareos.com>
Date: Wed, 8 May 2013 11:15:08 +0200
Subject: [PATCH] Fix regressions now that prune jobs.

Now that prune jobs can prune more then just backup jobs add the
jobtype=backup as argument to the cmd so it knows what to prune.
---
 tests/prune-base-job-test  | 8 ++++----
 tests/prune-config-test    | 6 +++---
 tests/prune-copy-test      | 2 +-
 tests/prune-migration-test | 2 +-
 tests/prune-test           | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/prune-base-job-test b/tests/prune-base-job-test
index a0b47b5..59ccdcf 100755
--- a/tests/prune-base-job-test
+++ b/tests/prune-base-job-test
@@ -110,7 +110,7 @@ sql
 SELECT count(*) FROM BaseFiles;
 
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @$out $tmp/log1.out
 @################################################################
@@ -120,7 +120,7 @@ wait
 messages
 @$out $tmp/log11.out
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @$out $tmp/log1.out
 @################################################################
@@ -136,7 +136,7 @@ wait
 messages
 @$out $tmp/log13.out
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @$out $tmp/log1.out
 @################################################################
@@ -155,7 +155,7 @@ messages
 list jobs
 @$out $tmp/log14.out
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 END_OF_DATA
 
diff --git a/tests/prune-config-test b/tests/prune-config-test
index c93b6b7..4048786 100755
--- a/tests/prune-config-test
+++ b/tests/prune-config-test
@@ -56,7 +56,7 @@ messages
 @$out $tmp/log10.out
 @# should prune nothing
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 quit
 EOF
@@ -76,7 +76,7 @@ reload
 messages
 @# should prune jobs using DailySave
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 EOF
 
@@ -96,7 +96,7 @@ reload
 messages
 @# should prune jobs using Full Set
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 EOF
 
diff --git a/tests/prune-copy-test b/tests/prune-copy-test
index ce0c99c..6fdb977 100755
--- a/tests/prune-copy-test
+++ b/tests/prune-copy-test
@@ -79,7 +79,7 @@ sql
 SELECT JobId, Name, JobTDate, StartTime, Type, Level, JobFiles, JobStatus
 FROM Job ORDER BY StartTime;
 
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @################################################################
 @# now do a restore
diff --git a/tests/prune-migration-test b/tests/prune-migration-test
index ea0055d..e6c933c 100755
--- a/tests/prune-migration-test
+++ b/tests/prune-migration-test
@@ -66,7 +66,7 @@ sql
 SELECT JobId, JobTDate, StartTime, EndTime FROM Job;
 
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 sql
 SELECT JobId, JobTDate, StartTime, EndTime FROM Job;
diff --git a/tests/prune-test b/tests/prune-test
index 3eb8103..9766bf7 100755
--- a/tests/prune-test
+++ b/tests/prune-test
@@ -39,7 +39,7 @@ messages
 @################################################################
 @# Should not prune anything
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @$out $tmp/log4.out
 @################################################################
@@ -53,7 +53,7 @@ wait
 messages
 @sleep 2
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @$out $tmp/log5.out
 @################################################################
@@ -63,7 +63,7 @@ wait
 messages
 @sleep 2
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 @$out $tmp/log6.out
 @################################################################
@@ -80,7 +80,7 @@ messages
 @################################################################
 @# Should prune the restore job and the last incremental job (jobfiles=0)
 list jobs
-prune jobs yes
+prune jobs jobtype=backup yes
 list jobs
 quit
 EOF