projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relax build deps to benefit kFreeBSD systems
[debian/amanda]
/
installcheck
/
Amanda_Taper_Scan.pl
diff --git
a/installcheck/Amanda_Taper_Scan.pl
b/installcheck/Amanda_Taper_Scan.pl
index 92550f100e47922e51f3e70d9580c37665c877da..a2d96093d7a24f264e7fb4a496dc90a0ac2301c2 100644
(file)
--- a/
installcheck/Amanda_Taper_Scan.pl
+++ b/
installcheck/Amanda_Taper_Scan.pl
@@
-38,10
+38,11
@@
Installcheck::log_test_output();
# and disable Debug's die() and warn() overrides
Amanda::Debug::disable_die_override();
# and disable Debug's die() and warn() overrides
Amanda::Debug::disable_die_override();
-my $tapelist = "$Installcheck::TMP/tapelist";
+my $tapelist_filename = "$Installcheck::TMP/tapelist";
+my $tapelist = Amanda::Tapelist->new($tapelist_filename);
sub set_tapelist {
my ($content) = @_;
sub set_tapelist {
my ($content) = @_;
- open(my $fh, ">", $tapelist
) or die("opening '$tapelist
': $!");
+ open(my $fh, ">", $tapelist
_filename) or die("opening '$tapelist_filename
': $!");
print $fh $content;
close($fh);
}
print $fh $content;
close($fh);
}
@@
-51,8
+52,8
@@
sub set_tapelist {
# methods are never invoked in this test.
my $taperscan = Amanda::Taper::Scan->new(
algorithm => "traditional",
# methods are never invoked in this test.
my $taperscan = Amanda::Taper::Scan->new(
algorithm => "traditional",
- changer =>
{}
, # (not used)
- tapelist
_filename
=> $tapelist,
+ changer =>
undef
, # (not used)
+ tapelist => $tapelist,
tapecycle => 1, # will be changed periodically below
labelstr => "TEST-[0-9]",
autolabel => { 'template' => "TEST-%",
tapecycle => 1, # will be changed periodically below
labelstr => "TEST-[0-9]",
autolabel => { 'template' => "TEST-%",
@@
-140,3
+141,5
@@
ok(!$taperscan->is_reusable_volume(label => "TEST-2", new_label_ok => 0), " TEST
ok(!$taperscan->is_reusable_volume(label => "TEST-3", new_label_ok => 0), " TEST-3 not reusable");
ok(!$taperscan->is_reusable_volume(label => "TEST-4", new_label_ok => 0), " TEST-4 not reusable");
ok(!$taperscan->is_reusable_volume(label => "TEST-3", new_label_ok => 0), " TEST-3 not reusable");
ok(!$taperscan->is_reusable_volume(label => "TEST-4", new_label_ok => 0), " TEST-4 not reusable");
+$taperscan->quit();
+