Merge tag 'upstream/3.3.3'

[debian/amanda] / installcheck / Amanda_Config.pl

diff --git a/installcheck/Amanda_Config.pl b/installcheck/Amanda_Config.pl
index 362dcb5cdbe7e42b222a2c9eabc59e2c6eecde48..0aac704037a33df665b15fc18c03fa7707753dbb 100644 (file)
--- a/installcheck/Amanda_Config.pl
+++ b/installcheck/Amanda_Config.pl
@@ -1,8 +1,9 @@
 # Copyright (c) 2007-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
@@ -212,7 +213,7 @@ $testconf->add_script('my_script', [
   'plugin' => '"script-email"',
   'execute-on' => 'pre-host-backup, post-host-backup',
   'execute-where' => 'client',
-  'property' => '"mailto" "amandabackup" "amanda"',
+  'property' => '"mailto" "backup" "amanda"',
 ]);
 $testconf->add_device('my_device', [
   'comment' => '"my device is mine, not yours"',
@@ -1134,7 +1135,7 @@ my $properties = getconf($CNF_PROPERTY);
     );
 
 for my $pn (@prop_names) {
-    is_deeply($properties->{$pn->{'val'}}->{values}, [ "VALUE" ]);
+    is_deeply($properties->{$pn->{'val'}}->{values}, [ "VALUE" ], "property $pn->{'val'}");
 }
 
 $testconf = Installcheck::Config->new();