projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.3.0
[debian/amanda]
/
installcheck
/
Amanda_Changer_rait.pl
diff --git
a/installcheck/Amanda_Changer_rait.pl
b/installcheck/Amanda_Changer_rait.pl
index 259c2b5b0925a89375cb6ea150acd5bb78fd5c84..2139296bfbba131a705519ab18c88109c1f2dd18 100644
(file)
--- a/
installcheck/Amanda_Changer_rait.pl
+++ b/
installcheck/Amanda_Changer_rait.pl
@@
-16,7
+16,7
@@
# Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
# Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
-use Test::More tests => 4
2
;
+use Test::More tests => 4
3
;
use File::Path;
use Data::Dumper;
use strict;
use File::Path;
use Data::Dumper;
use strict;
@@
-103,7
+103,8
@@
sub test_threeway {
pass("Create 3-way RAIT of vtapes");
my $steps = define_steps
pass("Create 3-way RAIT of vtapes");
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $chg->quit() };
step get_info => sub {
$chg->info(info_cb => $steps->{'check_info'},
step get_info => sub {
$chg->info(info_cb => $steps->{'check_info'},
@@
-297,9
+298,11
@@
sub test_threeway_error {
my $chg = Amanda::Changer->new("chg-rait:{chg-disk:$tapebase/1,chg-disk:$tapebase/2,ERROR}");
pass("Create 3-way RAIT of vtapes, with the third errored out");
my $chg = Amanda::Changer->new("chg-rait:{chg-disk:$tapebase/1,chg-disk:$tapebase/2,ERROR}");
pass("Create 3-way RAIT of vtapes, with the third errored out");
+ is($chg->have_inventory(), '1', "changer have inventory");
my $steps = define_steps
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $chg->quit() };
step get_info => sub {
$chg->info(info_cb => $steps->{'check_info'},
step get_info => sub {
$chg->info(info_cb => $steps->{'check_info'},
@@
-389,7
+392,8
@@
sub test_normal_inventory {
pass("Create 3-way RAIT of vtapes with correctly-labeled children");
my $steps = define_steps
pass("Create 3-way RAIT of vtapes with correctly-labeled children");
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $chg->quit() };
step setup => sub {
reset_taperoot();
step setup => sub {
reset_taperoot();
@@
-454,7
+458,8
@@
sub test_properties {
"Create RAIT device from a named config subsection");
my $steps = define_steps
"Create RAIT device from a named config subsection");
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $chg->quit() };
step do_load_1 => sub {
reset_taperoot();
step do_load_1 => sub {
reset_taperoot();
@@
-498,7
+503,8
@@
sub test_except_slots {
my $chg;
my $steps = define_steps
my $chg;
my $steps = define_steps
- cb_ref => \$finished_cb;
+ cb_ref => \$finished_cb,
+ finalize => sub { $chg->quit() if defined $chg };
step start => sub {
$chg = Amanda::Changer->new("myrait");
step start => sub {
$chg = Amanda::Changer->new("myrait");