X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2Fpp-scripts.pl;h=311e6331a9fcf326e15265242be581dfacdff5e9;hb=e676d2a937a46194f0bd97a130ae1a4138e8b4e9;hp=c38550a11ecfddbd46a0ecaf0c7446ad669ed193;hpb=79cdc4b6ea8848b21ba4a0e7d2fd3bc401e0bebe;p=debian%2Famanda

diff --git a/installcheck/pp-scripts.pl b/installcheck/pp-scripts.pl
index c38550a..311e633 100644
--- a/installcheck/pp-scripts.pl
+++ b/installcheck/pp-scripts.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2008 Zmanda Inc.  All Rights Reserved.
+# Copyright (c) 2008,2009 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
@@ -13,13 +13,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 => 8;
+use Test::More tests => 10;
 
 use lib "@amperldir@";
 use Cwd qw(abs_path getcwd);
+use Installcheck;
+use Installcheck::Dumpcache;
 use Installcheck::Config;
 use Installcheck::Run qw(run run_err $diskname amdump_diag);
 use Amanda::Config qw( :init );
@@ -31,7 +33,7 @@ my $testconf;
 
 # Run amdump with client- and server-side scripts
 
-my $templog = $Amanda::Paths::AMANDA_TMPDIR . "/check-script." . $$;
+my $templog = $Installcheck::TMP . "/check-script." . $$;
 
 sub verify_log {
     my $msg = shift;
@@ -47,7 +49,9 @@ sub verify_log {
 
     my $linenum = 1;
     foreach $exp (@exp) {
+	chomp $exp;
 	$got = <$logfile>;
+	chomp $got;
 	if (!$got) {
 	    fail($msg);
 	    diag("    Line: $linenum");
@@ -56,7 +60,7 @@ sub verify_log {
 	    diag($exp);
 	    return;
 	}
-	chomp $got;
+	$got =~ s/ *$//g;
 	if ($got ne $exp) {
 	    fail($msg);
 	    diag("    Line: $linenum");
@@ -81,7 +85,7 @@ sub verify_log {
 # check script on client
 
 $testconf = Installcheck::Run::setup();
-$testconf->add_param('label_new_tapes', '"TESTCONF%%"');
+$testconf->add_param('autolabel', '"TESTCONF%%" empty volume_error');
 
 $testconf->add_dle(<<EODLE);
 localhost diskname1 $diskname {
@@ -105,8 +109,8 @@ unlink $templog;
 ok(run('amcheck', '-c', 'TESTCONF'), "amcheck runs successfully for client scripts.");
 
 verify_log("amcheck invokes correct script commands",
-    "TESTCONF pre-dle-amcheck client localhost diskname1 $diskname ",
-    "TESTCONF post-dle-amcheck client localhost diskname1 $diskname ",
+    "check TESTCONF pre-dle-amcheck client localhost diskname1 $diskname",
+    "check TESTCONF post-dle-amcheck client localhost diskname1 $diskname",
 );
 
 unlink $templog;
@@ -114,17 +118,17 @@ ok(run('amdump', 'TESTCONF'), "amdump runs successfully for client scripts.")
     or amdump_diag();
 
 verify_log("amdump invokes correct script commands",
-    "TESTCONF pre-dle-estimate client localhost diskname1 $diskname 0",
-    "TESTCONF post-dle-estimate client localhost diskname1 $diskname 0",
-    "TESTCONF pre-dle-backup client localhost diskname1 $diskname 0",
-    "TESTCONF post-dle-backup client localhost diskname1 $diskname 0",
+    "estimate TESTCONF pre-dle-estimate client localhost diskname1 $diskname 0",
+    "estimate TESTCONF post-dle-estimate client localhost diskname1 $diskname 0",
+    "backup TESTCONF pre-dle-backup client localhost diskname1 $diskname 0",
+    "backup TESTCONF post-dle-backup client localhost diskname1 $diskname 0",
 );
 
 Installcheck::Run::cleanup();
 
 #check script on server
 $testconf = Installcheck::Run::setup();
-$testconf->add_param('label_new_tapes', '"TESTCONF%%"');
+$testconf->add_param('autolabel', '"TESTCONF%%" empty volume_error');
 
 $testconf->add_dle(<<EODLE);
 localhost diskname2 $diskname {
@@ -136,6 +140,24 @@ localhost diskname2 $diskname {
     }
     script {
 	plugin "amlog-script"
+	single-execution yes
+	execute-where server
+	execute-on pre-host-amcheck, post-host-amcheck, pre-host-estimate, post-host-estimate, pre-host-backup, post-host-backup
+	property "logfile" "$templog"
+    }
+}
+EODLE
+$testconf->add_dle(<<EODLE);
+localhost diskname3 $diskname {
+    installcheck-test
+    program "APPLICATION"
+    application {
+	plugin "amgtar"
+	property "atime-preserve" "no"
+    }
+    script {
+	plugin "amlog-script"
+	single-execution yes
 	execute-where server
 	execute-on pre-host-amcheck, post-host-amcheck, pre-host-estimate, post-host-estimate, pre-host-backup, post-host-backup
 	property "logfile" "$templog"
@@ -148,8 +170,8 @@ unlink $templog;
 ok(run('amcheck', '-c', 'TESTCONF'), "amcheck runs successfully for server scripts.");
 
 verify_log("amcheck invokes correct script commands",
-    "TESTCONF pre-host-amcheck server localhost diskname2 $diskname ",
-    "TESTCONF post-host-amcheck server localhost diskname2 $diskname ",
+    "check TESTCONF pre-host-amcheck server localhost diskname3 $diskname",
+    "check TESTCONF post-host-amcheck server localhost diskname3 $diskname",
 );
 
 unlink $templog;
@@ -157,11 +179,64 @@ ok(run('amdump', 'TESTCONF'), "amdump runs successfully for server scripts.")
     or amdump_diag();
 
 verify_log("amdump invokes correct script commands",
-    "TESTCONF pre-host-estimate server localhost diskname2 $diskname 0",
-    "TESTCONF post-host-estimate server localhost diskname2 $diskname 0",
-    "TESTCONF pre-host-backup server localhost diskname2 $diskname ",
-    "TESTCONF post-host-backup server localhost diskname2 $diskname ",
+    "estimate TESTCONF pre-host-estimate server localhost diskname3 $diskname",
+    "estimate TESTCONF post-host-estimate server localhost diskname3 $diskname",
+    "backup TESTCONF pre-host-backup server localhost diskname3 $diskname",
+    "backup TESTCONF post-host-backup server localhost diskname3 $diskname",
+);
+
+unlink $templog;
+Installcheck::Run::cleanup();
+
+#check order script
+$testconf = Installcheck::Run::setup();
+$testconf->add_param('autolabel', '"TESTCONF%%" empty volume_error');
+
+$testconf->add_dle(<<EODLE);
+localhost diskname2 $diskname {
+    installcheck-test
+    program "APPLICATION"
+    application {
+	plugin "amgtar"
+	property "atime-preserve" "no"
+    }
+    script {
+	plugin "amlog-script"
+	execute-where client
+	execute-on pre-host-amcheck
+	property "logfile" "$templog"
+	property "TEXT" "50"
+	order 50
+    }
+    script {
+	plugin "amlog-script"
+	execute-where client
+	execute-on pre-host-amcheck
+	property "logfile" "$templog"
+	property "TEXT" "60"
+	order 60
+    }
+    script {
+	plugin "amlog-script"
+	execute-where client
+	execute-on pre-host-amcheck
+	property "logfile" "$templog"
+	property "TEXT" "40"
+	order 40
+    }
+}
+EODLE
+$testconf->write();
+
+unlink $templog;
+ok(run('amcheck', '-c', 'TESTCONF'), "amcheck runs successfully for ordered scripts.");
+
+verify_log("amcheck invokes script in correct order",
+    "check TESTCONF pre-host-amcheck client localhost diskname2 $diskname  40",
+    "check TESTCONF pre-host-amcheck client localhost diskname2 $diskname  50",
+    "check TESTCONF pre-host-amcheck client localhost diskname2 $diskname  60",
 );
 
+
 unlink $templog;
 Installcheck::Run::cleanup();