From: Steven Jenkins <sjenkins@sinenomine.net>
Date: Tue, 17 Mar 2009 03:07:06 +0000 (+0000)
Subject: DEVEL15-tests-update-20090316
X-Git-Tag: openafs-devel-1_5_58~67
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2ff174b0117fae02f616200eff0c0944b05e6e39;p=packages%2Fo%2Fopenafs.git

DEVEL15-tests-update-20090316

LICENSE IPL10

1- make afs-newcell.pl remove KeyFile in unwind
2- correct missing space in volserver setup for DAFS
3- fix klog to not try to use a Kerberos realm name
4- fix minor POD bug in src/tests/OpenAFS/wrapper.pm
5- enhance src/tests/OpenAFS/vos.pm to support On-line/Off-line state


(cherry picked from commit 8aa03f1168c19166333a47e88e667a8ca5138133)
---

diff --git a/src/tests/OpenAFS/Auth.pm b/src/tests/OpenAFS/Auth.pm
index ac0b9641a..5adbdf62a 100644
--- a/src/tests/OpenAFS/Auth.pm
+++ b/src/tests/OpenAFS/Auth.pm
@@ -380,7 +380,7 @@ sub authorize {
   my $self = shift;
   my $principal = shift || 'admin';
   #run("echo \"Proceeding w/o authentication\"|klog -pipe ${principal}\@$self->{'realm'}");
-  run("klog $principal\@$self->{'realm'}");
+  run("klog $principal");
 }
 
 1;
diff --git a/src/tests/OpenAFS/vos.pm b/src/tests/OpenAFS/vos.pm
index 3f1ae6a6e..cdc33e353 100644
--- a/src/tests/OpenAFS/vos.pm
+++ b/src/tests/OpenAFS/vos.pm
@@ -144,6 +144,7 @@ sub AFS_vos_move {
 #: - id           ID of this volume
 #: - kind         Kind of volume (RW, RO, or BK)
 #: - inuse        Disk space in use
+#: - state        On-line or Off-line
 #: - maxquota     Maximum disk usage quota
 #: - minquota     Minimum disk usage quota (optional)
 #: - stamp_create Time when volume was originally created
@@ -172,7 +173,7 @@ sub AFS_vos_examine {
   push(@args, '-cell', $cell ? $cell : $AFS_Parms{'cell'});
   %result = &wrapper('vos', \@args,
 		     [$vos_err_parse,
-		      ['^(\S+)\s*(\d+)\s*(RW|RO|BK)\s*(\d+)\s*K',          'name', 'id', 'kind', 'inuse'],
+		      ['^(\S+)\s*(\d+)\s*(RW|RO|BK)\s*(\d+)\s*K\s*([-\w]+)',          'name', 'id', 'kind', 'inuse', 'state'],
 		      ['MaxQuota\s*(\d+)\s*K',                             'maxquota'     ],
 		      ['MinQuota\s*(\d+)\s*K',                             'minquota'     ],
 		      ['Creation\s*(.*\S+)',                               'stamp_create' ],
diff --git a/src/tests/OpenAFS/wrapper.pm b/src/tests/OpenAFS/wrapper.pm
index 4e4931f22..3649a4207 100644
--- a/src/tests/OpenAFS/wrapper.pm
+++ b/src/tests/OpenAFS/wrapper.pm
@@ -77,7 +77,7 @@ want to touch (e.g. B<vos dump> when the output file is stdout).
 
 If specified, the path to be used for the program to execute, instead of
 deriving it from the command name.  This is useful when we want the
-command's argv[0] (which is always I<$cmd}) to be different from the
+command's argv[0] (which is always I<$cmd>) to be different from the
 path to the program.
 
 =item errors_last
diff --git a/src/tests/afs-newcell.pl b/src/tests/afs-newcell.pl
index 8ec1bc1c3..606bc005d 100755
--- a/src/tests/afs-newcell.pl
+++ b/src/tests/afs-newcell.pl
@@ -584,6 +584,7 @@ if ($unwind) {
     unwind($os->command('remove', "$path->{'afsconfdir'}/ThisCell"));
     unwind($os->command('remove', "$path->{'afsconfdir'}/CellServDB"));
     unwind($os->command('remove', "$path->{'afsconfdir'}/UserList"));
+    unwind($os->command('remove', "$path->{'afsconfdir'}/KeyFile"));
     unwind($os->command('remove', "$path->{'afsbosconfigdir'}/BosConfig"));
     unwind($os->command('fileserver-stop'));
 }
@@ -680,7 +681,7 @@ print "debug: Starting the fileserver...\n" if $debug;
 if ($with_dafs) {
   run( "$bos create $server dafs dafs ".
        "-cmd \"$path->{'afssrvlibexecdir'}/fileserver $options_fileserver\" ".
-       "-cmd \"$path->{'afssrvlibexecdir'}/volserver $options_volserver\"".
+       "-cmd \"$path->{'afssrvlibexecdir'}/volserver $options_volserver\" ".
        "-cmd \"$path->{'afssrvlibexecdir'}/salvageserver $options_salvageserver\" ".
        "-cmd \"$path->{'afssrvlibexecdir'}/salvager $options_salvager\" ".
        "-noauth");