aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Allbery <rra@stanford.edu>2010-02-20 23:19:50 -0800
committerRuss Allbery <rra@stanford.edu>2010-02-20 23:19:50 -0800
commitc4234b72a39b25122dbba769e028d1d105a4132e (patch)
treed595e1cabfeabbd4e629e0cabd4dca55aac8b3f2
parent3d55468b4660646f047328030cbd425dc99ce3b3 (diff)
Fix some test numbers in the Perl tests
-rwxr-xr-xperl/t/kadmin.t2
-rwxr-xr-xperl/t/keytab.t9
2 files changed, 5 insertions, 6 deletions
diff --git a/perl/t/kadmin.t b/perl/t/kadmin.t
index b9ac769..bbcb15a 100755
--- a/perl/t/kadmin.t
+++ b/perl/t/kadmin.t
@@ -72,7 +72,7 @@ SKIP: {
# implementation is configured. This retests some things that are also tested
# by the keytab test, but specifically through the Wallet::Kadmin API.
SKIP: {
- skip 'no keytab configuration', 15 unless -f 't/data/test.keytab';
+ skip 'no keytab configuration', 14 unless -f 't/data/test.keytab';
# Set up our configuration.
$Wallet::Config::KEYTAB_FILE = 't/data/test.keytab';
diff --git a/perl/t/keytab.t b/perl/t/keytab.t
index 4e253eb..046da9c 100755
--- a/perl/t/keytab.t
+++ b/perl/t/keytab.t
@@ -148,7 +148,7 @@ my $date = strftime ('%Y-%m-%d %H:%M:%S', localtime $trace[2]);
# Basic keytab creation and manipulation tests.
SKIP: {
- skip 'no keytab configuration', 49 unless -f 't/data/test.keytab';
+ skip 'no keytab configuration', 52 unless -f 't/data/test.keytab';
# Set up our configuration.
$Wallet::Config::KEYTAB_FILE = 't/data/test.keytab';
@@ -495,7 +495,7 @@ EOO
# since no synchronization targets are supported, but we want to still test
# the basic stub code.
SKIP: {
- skip 'no keytab configuration', 106 unless -f 't/data/test.keytab';
+ skip 'no keytab configuration', 18 unless -f 't/data/test.keytab';
# Test setting synchronization attributes, which can also be done without
# configuration.
@@ -563,9 +563,7 @@ EOO
# Tests for enctype restriction.
SKIP: {
- unless (-f 't/data/test.keytab') {
- skip 'no keytab configuration', 36;
- }
+ skip 'no keytab configuration', 36 unless -f 't/data/test.keytab';
# Set up our configuration.
$Wallet::Config::KEYTAB_FILE = 't/data/test.keytab';
@@ -648,6 +646,7 @@ EOO
# Now, try testing limiting the enctypes to just one.
SKIP: {
skip 'insufficient recognized enctypes', 14 unless @enctypes > 1;
+
is ($one->attr ('enctypes', [ $enctypes[0] ], @trace), 1,
'Setting a single enctype works');
for my $enctype (@enctypes) {