update changelog to reflect new upstream version

[debian/amanda] / installcheck / Amanda_Changer_rait.pl

diff --git a/installcheck/Amanda_Changer_rait.pl b/installcheck/Amanda_Changer_rait.pl
index 259c2b5b0925a89375cb6ea150acd5bb78fd5c84..1526ad3f121d0816ef6ffc7878eda3e6b770db69 100644 (file)
--- a/installcheck/Amanda_Changer_rait.pl
+++ b/installcheck/Amanda_Changer_rait.pl
@@ -1,8 +1,9 @@
-# Copyright (c) 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2009-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -16,7 +17,7 @@
 # Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
-use Test::More tests => 42;
+use Test::More tests => 43;
 use File::Path;
 use Data::Dumper;
 use strict;
@@ -103,7 +104,8 @@ sub test_threeway {
     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'},
@@ -297,9 +299,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");
+    is($chg->have_inventory(), '1', "changer have inventory");
 
     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'},
@@ -389,7 +393,8 @@ sub test_normal_inventory {
     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();
@@ -454,7 +459,8 @@ sub test_properties {
        "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();
@@ -498,7 +504,8 @@ sub test_except_slots {
     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");