Merge tag 'upstream/3.3.3'

[debian/amanda] / installcheck / amvault.pl

diff --git a/installcheck/amvault.pl b/installcheck/amvault.pl
index 370b23be10b615380ab44d860e76aff81964c760..b5f966eb1a75993ad794869c15c04999723c5ea3 100644 (file)
--- a/installcheck/amvault.pl
+++ b/installcheck/amvault.pl
@@ -1,8 +1,9 @@
-# Copyright (c) 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2010-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
@@ -96,7 +97,6 @@ ok(run("$sbindir/amvault",
                'TESTCONF'),
     "amvault runs!")
     or diag($Installcheck::Run::stderr);
-
 my @tert_files = glob("$vtape_root/slot1/0*");
 ok(@tert_files > 0,
     "..and files appear on the tertiary volume!");
@@ -237,6 +237,7 @@ EOF
     };
     Amanda::MainLoop::call_later(sub { $chg->inventory(inventory_cb => $inventory_cb); });
     Amanda::MainLoop::run();
+    $chg->quit();
 
     # find TESTCONF02 in the inventory, and check that it is in an i/e slot
     my $notfound = "tertiary volume not found";