projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move to modern source package format
[debian/amanda]
/
installcheck
/
Amanda_Recovery_Scan.pl
diff --git
a/installcheck/Amanda_Recovery_Scan.pl
b/installcheck/Amanda_Recovery_Scan.pl
index 40cf557332bb67a998a286cbf51d5b9033724760..dd704c7a17ef59dea96f4d55c0d004518ffe3469 100644
(file)
--- a/
installcheck/Amanda_Recovery_Scan.pl
+++ b/
installcheck/Amanda_Recovery_Scan.pl
@@
-41,11
+41,11
@@
Installcheck::log_test_output();
Amanda::Debug::disable_die_override();
# --------
Amanda::Debug::disable_die_override();
# --------
-# Interactiv
e
package
+# Interactiv
ity
package
-package Amanda::Interactiv
e
::Installcheck;
+package Amanda::Interactiv
ity
::Installcheck;
use vars qw( @ISA );
use vars qw( @ISA );
-@ISA = qw( Amanda::Interactiv
e
);
+@ISA = qw( Amanda::Interactiv
ity
);
sub new {
my $class = shift;
sub new {
my $class = shift;
@@
-58,7
+58,7
@@
sub user_request {
my %params = @_;
Amanda::Debug::debug("Change changer to multi-changer");
my %params = @_;
Amanda::Debug::debug("Change changer to multi-changer");
- $params{'
finished
_cb'}->(undef, "multi-changer");
+ $params{'
request
_cb'}->(undef, "multi-changer");
};
# --------
};
# --------
@@
-211,7
+211,8
@@
sub test_searching {
my $res03;
my $steps = define_steps
my $res03;
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $scan->quit() };
step start => sub {
$scan = Amanda::Recovery::Scan->new(chg => $chg);
step start => sub {
$scan = Amanda::Recovery::Scan->new(chg => $chg);
@@
-378,7
+379,8
@@
sub test_scan_poll {
my $res04;
my $steps = define_steps
my $res04;
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $scan->quit() };
step start => sub {
$chg = Amanda::Changer->new($chg_name);
step start => sub {
$chg = Amanda::Changer->new($chg_name);
@@
-437,15
+439,17
@@
sub test_scan_ask_poll {
my $chg_name = "multi-changer";
my $chg = Amanda::Changer->new($chg_name);
amlabel_sync($chg, $chg_name, 2, 'TESTCONF05');
my $chg_name = "multi-changer";
my $chg = Amanda::Changer->new($chg_name);
amlabel_sync($chg, $chg_name, 2, 'TESTCONF05');
+ $chg->quit();
$chg = Amanda::Changer->new("disk-changer");
my $steps = define_steps
$chg = Amanda::Changer->new("disk-changer");
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $scan->quit() };
step start => sub {
step start => sub {
- my $interactiv
e = Amanda::Interactive
::Installcheck->new();
+ my $interactiv
ity = Amanda::Interactivity
::Installcheck->new();
$scan = Amanda::Recovery::Scan->new(chg => $chg,
$scan = Amanda::Recovery::Scan->new(chg => $chg,
- interactiv
e => $interactive
);
+ interactiv
ity => $interactivity
);
$scan->{'scan_conf'}->{'poll_delay'} = 10; # 10 ms
$steps->{'find_05'}->();
$scan->{'scan_conf'}->{'poll_delay'} = 10; # 10 ms
$steps->{'find_05'}->();
@@
-460,7
+464,7
@@
sub test_scan_ask_poll {
(my $err, $res05) = @_;
ok(!$err, "found TESTCONF05 on changer multi");
(my $err, $res05) = @_;
ok(!$err, "found TESTCONF05 on changer multi");
- ok($res05, "TESTCONF05 give a reservation after interactiv
e
");
+ ok($res05, "TESTCONF05 give a reservation after interactiv
ity
");
is($res05->{'chg'}->{'chg_name'}, $chg_name,
"found TESTCONF05 on correct changer: $chg_name");
is($res05->{'chg'}->{'chg_name'}, $chg_name,
"found TESTCONF05 on correct changer: $chg_name");