Imported Upstream version 1.1

4 files changed, 12 insertions, 12 deletions

diff --git a/tests/server/admin-t b/tests/server/admin-t
index 6846609..f025d98 100755
--- a/tests/server/admin-t
+++ b/tests/server/admin-t
@@ -2,8 +2,8 @@
 #
 # Tests for the wallet-admin dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2008, 2009, 2010, 2011
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2008, 2009, 2010, 2011, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
@@ -140,9 +140,9 @@ seek (STDIN, 0, 0);
 ($out, $err) = run_admin ('initialize', 'rra');
 is ($err, "invalid admin principal rra\n", 'Initialize requires a principal');
 is ($out, "new\n", ' and nothing was run');
-($out, $err) = run_admin ('initialize', 'rra@stanford.edu');
+($out, $err) = run_admin ('initialize', 'eagle@eyrie.org');
 is ($err, '', 'Initialize succeeds with a principal');
-is ($out, "new\ninitialize rra\@stanford.edu\n", ' and runs the right code');
+is ($out, "new\ninitialize eagle\@eyrie.org\n", ' and runs the right code');
 
 # Test register.
 ($out, $err) = run_admin ('register', 'foo', 'foo', 'Foo::Bar');
@@ -170,9 +170,9 @@ is ($err, "some error\n", 'Error handling succeeds for destroy');
 is ($out, "new\n"
     . 'This will delete all data in the wallet database.'
     . '  Are you sure (N/y)? ' . "destroy\n", ' and calls the right methods');
-($out, $err) = run_admin ('initialize', 'rra@stanford.edu');
+($out, $err) = run_admin ('initialize', 'eagle@eyrie.org');
 is ($err, "some error\n", 'Error handling succeeds for initialize');
-is ($out, "new\ninitialize rra\@stanford.edu\n",
+is ($out, "new\ninitialize eagle\@eyrie.org\n",
     ' and calls the right methods');
 ($out, $err) = run_admin ('register', 'object', 'foo', 'Foo::Object');
 is ($err, "some error\n", 'Error handling succeeds for register object');
diff --git a/tests/server/backend-t b/tests/server/backend-t
index 7e9287d..2ed8404 100755
--- a/tests/server/backend-t
+++ b/tests/server/backend-t
@@ -2,14 +2,14 @@
 #
 # Tests for the wallet-backend dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
 use strict;
-use Test::More tests => 1314;
+use Test::More tests => 1311;
 
 # Create a dummy class for Wallet::Server that prints what method was called
 # with its arguments and returns data for testing.
@@ -244,7 +244,7 @@ my %commands = (autocreate => [2, 2],
                 comment    => [2, 3],
                 create     => [2, 2],
                 destroy    => [2, 2],
-                expires    => [2, 4],
+                expires    => [2, 3],
                 get        => [2, 2],
                 getacl     => [3, 3],
                 getattr    => [3, 3],
diff --git a/tests/server/keytab-t b/tests/server/keytab-t
index a9f5450..94c1bd8 100755
--- a/tests/server/keytab-t
+++ b/tests/server/keytab-t
@@ -2,7 +2,7 @@
 #
 # Tests for the keytab-backend dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/server/report-t b/tests/server/report-t
index 43ec9d1..ad05363 100755
--- a/tests/server/report-t
+++ b/tests/server/report-t
@@ -2,7 +2,7 @@
 #
 # Tests for the wallet-report dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2009, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #