Commit win32 regression patch from Michael Short

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5755 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index 36fcfbff33383f8661cea83f55b05a2bafee54b7..9202de981f29b1746901882ee40f781e2d30187b 100644 (file)
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -216,7 +216,7 @@ Pool {
   Storage = File
   Migration High Bytes = 40M
   Migration Low Bytes = 20M
-  Migration Time = 60
+  Migration Time = 1
 }
 
 Pool {

diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index 99de021cf2bf733c63ee4bfd1566281ab1eb0172..96e968bb021d01920cf2240667add65ca7fc652c 100755 (executable)
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -39,20 +39,18 @@ run job=$JobName level=Full yes
 run job=$JobName level=Full yes
 wait
 update volume=FileVolume001 VolStatus=Used
-sql
-update Job SET RealEndTime='2004-01-01 12:01:01' WHERE JobId IN (2,3);
-
 llist jobid=2,3
 list jobs
 list volumes
+@#setdebug level=20 dir
 @# should migrate only jobid=2 and 3
 run job=migrate-time yes
 wait
 messages
 wait
-purge volume=FileVolume001
 list jobs
 list volumes
+purge volume=FileVolume001
 @# 
 @# now do a restore
 @#

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 1c1c34d29454960063032e95ecdfa72fa66c8494..dbd88e00af9ae883e75215b3195ce2055680aae1 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -74,6 +74,5 @@ cd ${cwd}
 check_two_logs
 #diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
 diff ${cwd}/tmp/original ${cwd}/tmp/restored                
- 
 dstat=$?
 end_test