Fix failing tape tests because of new config scheme

bareos · Sep 16, 2016 · b5095d7 · b5095d7
1 parent 194217d
commit b5095d7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/tests/ansi-label-tape b/tests/ansi-label-tape
@@ -14,9 +14,9 @@ JobName=backuptape
 
 require_tape_drive
 
+scripts/cleanup-tape
 scripts/copy-tape-confs
 /bin/cp -f scripts/ansi-sd-tape.conf bin/bareos-sd.conf
-scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 

diff --git a/tests/backup-bareos-tape b/tests/backup-bareos-tape
@@ -12,8 +12,8 @@ JobName=backuptape
 
 require_tape_drive
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
+scripts/copy-tape-confs
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 

diff --git a/tests/incremental-tape b/tests/incremental-tape
@@ -9,8 +9,8 @@ JobName=IncTape
 
 require_tape_drive
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
+scripts/copy-tape-confs
 
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then

diff --git a/tests/restore-by-file-tape b/tests/restore-by-file-tape
@@ -12,8 +12,8 @@ JobName=restorebyfile
 
 require_tape_drive
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
+scripts/copy-tape-confs
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list

diff --git a/tests/small-file-size-tape b/tests/small-file-size-tape
@@ -9,8 +9,8 @@ JobName=smallfilesize
 
 require_tape_drive
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
+scripts/copy-tape-confs
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 cp ${cwd}/bin/bareos-sd.conf ${cwd}/tmp/1

diff --git a/tests/truncate-bug-tape b/tests/truncate-bug-tape
@@ -8,8 +8,8 @@ JobName=truncatebug
 
 require_tape_drive
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
+scripts/copy-tape-confs
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 

diff --git a/tests/verify-vol-tape b/tests/verify-vol-tape
@@ -9,8 +9,8 @@ JobName=VerifyVol
 
 require_tape_drive
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
+scripts/copy-tape-confs
 
 echo "${cwd}/build" >${cwd}/tmp/file-list