From 5cd473f71968b3fef60bddc0a89b2cae70b1bdc3 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Mon, 2 Feb 2009 18:42:06 +0000 Subject: [PATCH] address lib/kadm5 test suite slowness In mod-principal tests for clearing the principal's policy, instead of just testing to see if the wrong string is output and timing out looking for it, check also for the new expected value. Cuts test suite run time by about two minutes for each pass (client vs server). ticket: 6357 target_version: 1.7 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21866 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/unit-test/api.0/mod-principal.exp | 1 + src/lib/kadm5/unit-test/api.2/mod-principal.exp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lib/kadm5/unit-test/api.0/mod-principal.exp b/src/lib/kadm5/unit-test/api.0/mod-principal.exp index d6a9cbc90..2d68a19c1 100644 --- a/src/lib/kadm5/unit-test/api.0/mod-principal.exp +++ b/src/lib/kadm5/unit-test/api.0/mod-principal.exp @@ -598,6 +598,7 @@ proc test20 {} { send "lindex \$principal 10\n" expect { -re "test-pol\n$prompt$" { fail "$test" } + -re "null\n$prompt$" { pass "$test" } timeout { pass "$test" } } send "lindex \$p1 6\n" diff --git a/src/lib/kadm5/unit-test/api.2/mod-principal.exp b/src/lib/kadm5/unit-test/api.2/mod-principal.exp index 4472c78ce..7c381c41a 100644 --- a/src/lib/kadm5/unit-test/api.2/mod-principal.exp +++ b/src/lib/kadm5/unit-test/api.2/mod-principal.exp @@ -598,6 +598,7 @@ proc test20 {} { send "lindex \$principal 10\n" expect { -re "test-pol\n$prompt$" { fail "$test" } + -re "null\n$prompt$" { pass "$test" } timeout { pass "$test" } } send "lindex \$p1 6\n" -- 2.26.2