summaryrefslogtreecommitdiff
path: root/tests/server/backend-t
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2014-07-16 13:46:50 -0700
committerRuss Allbery <eagle@eyrie.org>2014-07-16 13:46:50 -0700
commit1796d631f0846ec98cd286bc4284898a7300ee78 (patch)
tree6fd42de6dc858ef06c6d270410c32ec61f39e593 /tests/server/backend-t
parentf5194217566a6f4cdeffbae551153feb1412210d (diff)
parent6409733ee3b7b1910dc1c166a392cc628834146c (diff)
Merge tag 'upstream/1.1' into debian
Upstream version 1.1 Conflicts: NEWS README client/keytab.c perl/lib/Wallet/ACL.pm perl/sql/Wallet-Schema-0.08-PostgreSQL.sql perl/t/general/admin.t perl/t/verifier/ldap-attr.t Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6
Diffstat (limited to 'tests/server/backend-t')
-rwxr-xr-xtests/server/backend-t8
1 files changed, 4 insertions, 4 deletions
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],