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 ac0b9641a756267c7a2f47670637b41d243e1980..5adbdf62ad96c6b4d248e5834d160d121d03da3a 100644 (file)
--- 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 3f1ae6a6e21486cb4fb15eeb65a54ab553299bbe..cdc33e3531f3d2497aa83ce1e8deeba60abfd77f 100644 (file)
--- 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 4e4931f22f478d8f977534967b262b0a9f0368ad..3649a4207370b5530750f6630915fe0a18770397 100644 (file)
--- 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 8ec1bc1c313190fb8ba8c895010befbf17651a43..606bc005df02bc3ba1ca147fc3c045681db51e4a 100755 (executable)
--- 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");