X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2Famdump.pl;h=e6dc1a9456b625a9fa33c43aebbadb60e41d9831;hb=HEAD;hp=508e6e9615dfc0ac4d08a4f0dc8e6e7e42f30d9b;hpb=79cdc4b6ea8848b21ba4a0e7d2fd3bc401e0bebe;p=debian%2Famanda

diff --git a/installcheck/amdump.pl b/installcheck/amdump.pl
index 508e6e9..e6dc1a9 100644
--- a/installcheck/amdump.pl
+++ b/installcheck/amdump.pl
@@ -1,8 +1,9 @@
-# Copyright (c) 2005-2008 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
@@ -13,12 +14,15 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# Contact information: Zmanda Inc, 465 S Mathlida Ave, Suite 300
+# Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
-use Test::More tests => 2;
+use Test::More tests => 4;
+use strict;
+use warnings;
 
 use lib "@amperldir@";
+use Installcheck::Dumpcache;
 use Installcheck::Config;
 use Installcheck::Run qw(run run_err $diskname amdump_diag);
 use Amanda::Config qw( :init );
@@ -29,7 +33,7 @@ my $testconf;
 # Just run amdump.
 
 $testconf = Installcheck::Run::setup();
-$testconf->add_param('label_new_tapes', '"TESTCONF%%"');
+$testconf->add_param('autolabel', '"TESTCONF%%" empty volume_error');
 
 # one program "GNUTAR"
 $testconf->add_dle(<<EODLE);
@@ -62,4 +66,25 @@ $testconf->write();
 
 ok(!run('amdump', 'TESTCONF'), "amdump fails with nonexistent client");
 
+#check failure in validate_optstr.
+$testconf = Installcheck::Run::setup();
+$testconf->add_dle(<<EODLE);
+localhost diskname2 $diskname {
+    installcheck-test
+    program "APPLICATION"
+    application {
+        plugin "amgtar"
+        property "ATIME-PRESERVE" "NO"
+    }
+    compress client custom
+}
+EODLE
+$testconf->write();
+
+ok(!run("$amlibexecdir/planner", 'TESTCONF'), "amdump fails in validate_optstr");
+open(my $logfile, "<", "$CONFIG_DIR/TESTCONF/log/log")
+	or die("opening log: $!");
+my $logline = grep(/^\S+ planner localhost diskname2 \d* 0 \[client custom compression with no compression program specified\]/, <$logfile>);
+ok($logline, "planner fail without 'client custom compression with no compression program specified'");
+
 Installcheck::Run::cleanup();