Merge tag 'upstream/3.3.3'

[debian/amanda] / installcheck / Installcheck / Dumpcache.pm

diff --git a/installcheck/Installcheck/Dumpcache.pm b/installcheck/Installcheck/Dumpcache.pm
index 94a59146eb3ebd0bdbd7ff2a8ad0d2d278490806..ce2189a419a4c07c4d359d0a3c947853ffee3657 100644 (file)
--- a/installcheck/Installcheck/Dumpcache.pm
+++ b/installcheck/Installcheck/Dumpcache.pm
@@ -1,8 +1,9 @@
-# Copyright (c) 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2008-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
@@ -179,12 +180,12 @@ $flavors{'parts'} = sub {
     my $testconf = Installcheck::Run::setup();
     basic_settings($testconf);
     use_new_chg_disk($testconf);
-    $testconf->add_dumptype("installcheck-test-parts", [
-       "installcheck-test", "",
-       "tape_splitsize", "128k",
-       "fallback_splitsize", "128k",
+    $testconf->add_tapetype("TEST-TAPE", [
+       "length", "50M",
+       "part_size", "128k",
+       "part_cache_type", "memory",
     ]);
-    $testconf->add_dle("localhost $diskname installcheck-test-parts");
+    $testconf->add_dle("localhost $diskname installcheck-test");
     $testconf->write();
 
     ok(Installcheck::Run::run('amdump', 'TESTCONF'), "amdump for 'parts'"),