diff options
| author | Russ Allbery <rra@stanford.edu> | 2007-08-29 21:42:12 +0000 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2007-08-29 21:42:12 +0000 |
| commit | 68f5fbb99b9c58baf7d04ba371df77e28022b318 (patch) | |
| tree | e8468a90867681f332b5d978355e2afd54b3227c /tests | |
| parent | fe69f02800ded1a448fa2810f448e683f5a422d9 (diff) | |
Some more fixes for the new test and the new wallet error output. Also,
remctld now doesn't exit on SIGTERM, so send it something stronger.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/client/basic-t.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/client/basic-t.in b/tests/client/basic-t.in index 68fcd60..f088933 100644 --- a/tests/client/basic-t.in +++ b/tests/client/basic-t.in @@ -54,7 +54,7 @@ runfailure () { } # Print the number of tests. -echo 6 +echo 7 # Find the client program. if [ -f ../data/test.keytab ] ; then @@ -79,7 +79,7 @@ fi # Start the remctld daemon and wait for it to start. rm -f data/pid ( @REMCTLD@ -m -p 14444 -s `cat data/test.principal` -P data/pid \ - -f data/wallet.conf -d -S -F -k data/test.keytab &) + -f data/wallet.conf -S -F -k data/test.keytab &) KRB5CCNAME=data/test.cache; export KRB5CCNAME kinit -k -t data/test.keytab `cat data/test.principal` > /dev/null 2>&1 if [ $? != 0 ] ; then @@ -99,7 +99,7 @@ if [ ! -f data/pid ] ; then fi # Now, we can finally run our tests. -runsuccess "" -c fake-wallet get keytab -f data/fake-keytab service/fake-test +runsuccess "" -c fake-wallet get keytab -f keytab service/fake-test if cmp keytab data/fake-keytab >/dev/null 2>&1 ; then printcount "ok" rm keytab @@ -108,11 +108,11 @@ else fi runsuccess "Some stuff about service/fake-test" \ -c fake-wallet show keytab service/fake-test -runfailure 1 "Unknown object type srvtab" \ +runfailure 1 "wallet: Unknown object type srvtab" \ -c fake-wallet get srvtab service/fake-test -runfailure 1 "Unknown keytab service/unknown" \ +runfailure 1 "wallet: Unknown keytab service/unknown" \ -c fake-wallet show keytab service/unknown -runfailure 1 "Unknown keytab service/unknown" \ +runfailure 1 "wallet: Unknown keytab service/unknown" \ -c fake-wallet get keytab service/unknown runsuccess "Expiration date of service/fake-test" \ -c fake-wallet expires keytab service/fake-test @@ -120,6 +120,6 @@ runsuccess "Expiration date of service/fake-test" \ # Clean up. rm -f data/test.cache if [ -f data/pid ] ; then - kill -HUP `cat data/pid` + kill `cat data/pid` rm -f data/pid fi |