Update Win32 test

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

diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/bacula-dir-win32-tape.conf.in
index 0b1f6c59edff19f3531d43e9887e2921760678e0..919edc48699f8799a1cc5332a7af4012c2b843a4 100644 (file)
--- a/regress/scripts/bacula-dir-win32-tape.conf.in
+++ b/regress/scripts/bacula-dir-win32-tape.conf.in
@@ -13,7 +13,7 @@
 #
 
 Director {                            # define myself
-  Name = HeadMan
+  Name = @hostname@-dir
   DIRport = 8101                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
@@ -58,7 +58,7 @@ FileSet {
   Name = "Full Set"
   Enable VSS = yes
   Include { Options { signature=MD5 }
-    File =  c:
+    File =  "c:"
   }
 }
 
@@ -77,10 +77,10 @@ Schedule {
 # Client (File Services) to backup
 Client {
   Name = Tibs
-  Address = @hostname@
+  Address = tibs
   FDPort = 9102
   Catalog = MyCatalog
-  Password = "EFMzurI0uuuQZkWK8KC2ZzOndK3DHR9EYK9M3oDJH8om"
+  Password = "xBzFq+a9llZyGyfMaNO9e3outP86/1AUAT8P34RoT62G"
   File Retention = 30d                # 30 days
   Job Retention = 180d                # six months
   AutoPrune = yes                     # Prune expired Jobs/Files
@@ -90,7 +90,7 @@ Client {
 # Definition of DDS tape storage device
 Storage {
   Name = DDS-4
-  Address = @hostname@                # N.B. Use a fully qualified name here
+  Address = 192.168.68.112            # N.B. Use a fully qualified name here
   SDPort = 8103
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = DDS-4                      # must be same as Device in Storage daemon

diff --git a/regress/scripts/bacula-sd-win32-tape.conf.in b/regress/scripts/bacula-sd-win32-tape.conf.in
deleted file mode 100644 (file)
index 5bcd665..0000000
--- a/regress/scripts/bacula-sd-win32-tape.conf.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Default Bacula Storage Daemon Configuration file
-#
-#  For Bacula release 1.33
-#
-# You may need to change the name of your tape drive
-#   on the "Archive Device" directive in the Device
-#   resource.  If you change the Name and/or the 
-#   "Media Type" in the Device resource, please ensure
-#   that dird.conf has corresponding changes.
-#
-
-Storage {                             # definition of myself
-  Name = @hostname@-sd
-  SDPort = 8103                  # Director's port      
-  WorkingDirectory = "@working_dir@"
-  Pid Directory = "@piddir@"
-  Subsys Directory = "@subsysdir@"
-}
-
-#
-# List Directors who are permitted to contact Storage daemon
-#
-Director {
-  Name = HeadMan
-  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
-}
-
-#
-# Devices supported by this Storage daemon
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType. 
-#
-
-Device {
-  Name = DDS-4                     # 
-  Media Type = DDS-4
-  Archive Device = @tape_drive@
-  AutomaticMount = yes;               # when device opened, read it
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
-  @@sbindir@/tape_options
-# Maximum File Size = 1000000
-# MaximumVolumeSize = 100M
-}
-
-# 
-# Send all messages to the Director, 
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = HeadMan = all, !terminate
-}

diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs
index fc6126759f7e3ef255825703bf836aacb5122ee8..b221565313e7721f693053d3bf163af239f25007 100755 (executable)
--- a/regress/scripts/copy-win32-confs
+++ b/regress/scripts/copy-win32-confs
@@ -1,6 +1,6 @@
 #!/bin/sh
 /bin/cp -f scripts/bacula-dir-win32-tape.conf bin/bacula-dir.conf
-/bin/cp -f scripts/bacula-sd-win32-tape.conf bin/bacula-sd.conf
+/bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
-/bin/cp -f scripts/bconsole-win32.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bconsole.conf
 touch bin/tape_options

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 7dfccb936fab88923036d990147629300f13af79..046e7ab3e6d2b132d80f62933b7a5f10717322fa 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -36,7 +36,6 @@ sed -f ${out} ${cwd}/scripts/test-console.conf.in >${cwd}/scripts/test-console.c
 sed -f ${out} ${cwd}/scripts/bacula-dir-tape.conf.in >${cwd}/scripts/bacula-dir-tape.conf
 sed -f ${out} ${cwd}/scripts/bacula-dir-win32-tape.conf.in >${cwd}/scripts/bacula-dir-win32-tape.conf
 sed -f ${out} ${cwd}/scripts/bacula-sd-tape.conf.in >${cwd}/scripts/bacula-sd-tape.conf
-sed -f ${out} ${cwd}/scripts/bacula-sd-win32-tape.conf.in >${cwd}/scripts/bacula-sd-win32-tape.conf
 sed -f ${out} ${cwd}/scripts/bacula-sd-2tape.conf.in >${cwd}/scripts/bacula-sd-2tape.conf
 sed -f ${out} ${cwd}/scripts/cleanup-tape.in >${cwd}/scripts/cleanup-tape
 sed -f ${out} ${cwd}/scripts/cleanup-2tape.in >${cwd}/scripts/cleanup-2tape

diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape
index 42772d695a648c50027a6e0533501b28e9d1d02b..68472ae556c096a3d08c954b9681efcf4b120d02 100755 (executable)
--- a/regress/tests/backup-win32-tape
+++ b/regress/tests/backup-win32-tape
@@ -25,6 +25,8 @@ label storage=DDS-4 volume=TestVolume001 slot=0
 run job=NightlySave yes
 @sleep 10
 status storage=DDS-4
+@sleep 30
+messages
 wait
 messages
 @#