Fix regression test.

bareos · Apr 10, 2013 · c1a7b44 · c1a7b44
1 parent 00c17e9
commit c1a7b44
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/configs/scsi-crypto-test/bareos-dir.conf.scsi-crypto-test.in b/configs/scsi-crypto-test/bareos-dir.conf.scsi-crypto-test.in
@@ -12,12 +12,12 @@
 #   directives in the Messages resource.
 #
 
-Director {                            # define myself
+Director {
   Name = localhost-dir
-  DIRPort = 8101                # where we listen for UA connections
-  QueryFile = "/root/bareos-regress/bin/query.sql"
-  WorkingDirectory = "/root/bareos-regress/working"
-  PidDirectory = "/root/bareos-regress/working"
+  DIRPort = 8101
+  QueryFile = "@sbindir@/query.sql"
+  WorkingDirectory = "@working_dir@"
+  Pid Directory = "@piddir@"
   Maximum Concurrent Jobs = 100
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"
   Messages = Daemon
@@ -36,7 +36,7 @@ Job {
   Storage = tape
   Messages = Standard
   Pool = Default
-  Write Bootstrap = "/root/bareos-regress/working/NightlySave.bsr"
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 100
   SpoolData = yes
 # Prefer Mounted Volumes = no
@@ -52,7 +52,7 @@ Job {
   Storage = tape
   Messages = Standard
   Pool = Default
-  Write Bootstrap = "/root/bareos-regress/working/NightlySave.bsr"
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 100
   SpoolData = yes
 # Prefer Mounted Volumes = no
@@ -68,7 +68,7 @@ Job {
   Storage = tape
   Messages = Standard
   Pool = Default
-  Write Bootstrap = "/root/bareos-regress/working/NightlySave.bsr"
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 100
   SpoolData = yes
 # Prefer Mounted Volumes = no
@@ -84,7 +84,7 @@ Job {
   Storage = tape
   Messages = Standard
   Pool = Default
-  Write Bootstrap = "/root/bareos-regress/working/NightlySave.bsr"
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 100
   SpoolData = yes
 # Prefer Mounted Volumes = no
@@ -99,7 +99,7 @@ Job {
   Storage = Virtual
   Messages = Standard
   Pool = Default
-  Write Bootstrap = "/root/bareos-regress/working/NightlySave.bsr"
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 100
   SpoolData = yes
 # Prefer Mounted Volumes = no
@@ -259,7 +259,7 @@ Messages {
 #          time to time as it will grow indefinitely. However, it will
 #          also keep all your messages if the scroll off the console.
 #
-  append = "/root/bareos-regress/working/log" = all, !skipped
+  append = "@working_dir@/log" = all, !skipped
   catalog = all, !skipped
 }
 
@@ -270,7 +270,7 @@ Messages {
   mailcommand = "/root/bareos-regress/bin/bsmtp -h localhost -f \"\(Bareos regression\) %r\" -s \"Regression daemon message\" %r"
 # mail = pstorz@dass-it.de = all, !skipped
   console = all, !skipped, !saved
-  append = "/root/bareos-regress/working/log" = all, !skipped
+  append = "@working_dir@/log" = all, !skipped
   catalog = all, !skipped
 }
 

diff --git a/configs/scsi-crypto-test/bareos-sd.conf.scsi-crypto-test.in b/configs/scsi-crypto-test/bareos-sd.conf.scsi-crypto-test.in
@@ -10,12 +10,13 @@
 #   that dird.conf has corresponding changes.
 #
 
-Storage {                             # definition of myself
+Storage {
   Name = localhost-sd
-  SDPort = 8103                  # Director's port
-  WorkingDirectory = "/root/bareos-regress/working"
-  Pid Directory = "/root/bareos-regress/working"
-  Subsys Directory = "/root/bareos-regress/working"
+  SDPort = 8103
+  WorkingDirectory = "@working_dir@"
+  Pid Directory = "@piddir@"
+  SubSys Directory = "@subsysdir@"
+  Plugin Directory = "@sbindir@/plugins"
   Maximum Concurrent Jobs = 100
 }
 
@@ -34,14 +35,15 @@ Director {
 #
 
 Device {
-  Name = tape                     #
+  Name = tape
   Media Type = tape
   Archive Device = /dev/nst0
-  AutomaticMount = yes;               # when device opened, read it
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
+  AutomaticMount = yes
+  AlwaysOpen = yes
+  RemovableMedia = yes
+  Drive Crypto Enabled = Yes
+  Query Crypto Status = Yes
   @@sbindir@/tape_options
-  @@sbindir@/scsicrypto-sd.conf
 # Maximum File Size = 1000000
 # MaximumVolumeSize = 400M
 }
@@ -53,5 +55,5 @@ Device {
 Messages {
   Name = Standard
   director = localhost-dir = all, !terminate
-  append = "/root/bareos-regress/working/log1.sd" = all
+  append = "@working_dir@/log1.sd" = all
 }
diff --git a/tests/scsi-crypto-test b/tests/scsi-crypto-test
@@ -20,14 +20,8 @@ rm -f  ${CRYPTO_CACHE}
 # prepare director
 KEY_ENCRYPTION_KEY=`bin/bscrypto -g -`
 echo "Key Encryption Key = \"$KEY_ENCRYPTION_KEY\"" > bin/scsicrypto-dir.conf
-echo "Plugin Directory = /root/bareos-regress/bin/plugins/" >> bin/scsicrypto-dir.conf
 
 /bin/cp -f  ${rconfigs}/${TestName}/bareos-dir.conf.${TestName}  bin/bareos-dir.conf
-
-# prepare sd
-echo "Drive Crypto Enabled = Yes" > bin/scsicrypto-sd.conf
-echo "Query Crypto Status = Yes" >> bin/scsicrypto-sd.conf
-
 /bin/cp -f ${rconfigs}/${TestName}/bareos-sd.conf.${TestName} bin/bareos-sd.conf
 
 echo "${cwd}/build" >${cwd}/tmp/file-list