From d5583d2e54f6e279bf56332b4409e31ef26dd1dd Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Mon, 8 Dec 2025 18:18:18 -0600 Subject: [PATCH] tests: Make HDB writes async to speed tests --- tests/can/test_can.in | 2 +- tests/db/add-modify-delete.in | 2 +- tests/db/check-aliases.in | 2 +- tests/db/loaddump-db.in | 2 +- tests/gss/check-basic.in | 2 +- tests/gss/check-context.in | 2 +- tests/gss/check-gssmask.in | 2 +- tests/gss/check-nodns.in | 2 +- tests/gss/check-spnego.in | 2 +- tests/java/check-kinit.in | 2 +- tests/kdc/check-bx509.in | 2 +- tests/kdc/check-canon.in | 2 +- tests/kdc/check-cc.in | 2 +- tests/kdc/check-delegation.in | 2 +- tests/kdc/check-des.in | 2 +- tests/kdc/check-digest.in | 2 +- tests/kdc/check-fast.in | 2 +- tests/kdc/check-hdb-mitdb.in | 2 +- tests/kdc/check-httpkadmind.in | 8 ++++---- tests/kdc/check-kadmin.in | 2 +- tests/kdc/check-kdc.in | 2 +- tests/kdc/check-kinit.in | 2 +- tests/kdc/check-kpasswdd.in | 2 +- tests/kdc/check-pkinit.in | 2 +- tests/kdc/check-tester.in | 2 +- tests/kdc/check-uu.in | 2 +- 26 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/can/test_can.in b/tests/can/test_can.in index 3cda220c2..d227e1f34 100644 --- a/tests/can/test_can.in +++ b/tests/can/test_can.in @@ -50,7 +50,7 @@ fi port=@port@ -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" replay="${TESTS_ENVIRONMENT} ../../kdc/kdc-replay" if [ -f ${objdir}/${tst}.cf ]; then diff --git a/tests/db/add-modify-delete.in b/tests/db/add-modify-delete.in index 7f3a81908..7bfc32411 100644 --- a/tests/db/add-modify-delete.in +++ b/tests/db/add-modify-delete.in @@ -46,7 +46,7 @@ db_type=${1:-${default_db_type}} R=EXAMPLE.ORG -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" iproplog="${TESTS_ENVIRONMENT} ../../lib/kadm5/iprop-log" KRB5_CONFIG="${objdir}/krb5.conf-${db_type}" diff --git a/tests/db/check-aliases.in b/tests/db/check-aliases.in index fd6131f52..f9e8974cd 100644 --- a/tests/db/check-aliases.in +++ b/tests/db/check-aliases.in @@ -46,7 +46,7 @@ testfailed="echo test failed; cat messages.log; exit 1" R=TEST.H5L.SE -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A" KRB5_CONFIG="${objdir}/krb5.conf-${db_type}" export KRB5_CONFIG diff --git a/tests/db/loaddump-db.in b/tests/db/loaddump-db.in index 00d81861c..a4d138bbc 100644 --- a/tests/db/loaddump-db.in +++ b/tests/db/loaddump-db.in @@ -42,7 +42,7 @@ objdir="@objdir@" R=EXAMPLE.ORG -kadmin="../../kadmin/kadmin -l -r $R" +kadmin="../../kadmin/kadmin -l -A -r $R" kstash="../../kdc/kstash" hprop="../../kdc/hprop" hpropd="../../kdc/hpropd" diff --git a/tests/gss/check-basic.in b/tests/gss/check-basic.in index 8904310ab..0821208e2 100644 --- a/tests/gss/check-basic.in +++ b/tests/gss/check-basic.in @@ -54,7 +54,7 @@ cache="FILE:krb5ccfile" cache2="FILE:krb5ccfile2" nocache="FILE:no-such-cache" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" acquire_cred="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_acquire_cred" diff --git a/tests/gss/check-context.in b/tests/gss/check-context.in index a3cb8eb70..f6a00add4 100644 --- a/tests/gss/check-context.in +++ b/tests/gss/check-context.in @@ -56,7 +56,7 @@ kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}" kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache" klist="${TESTS_ENVIRONMENT} ../../kuser/heimtools klist -c $cache" kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache" -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" ktutil="${TESTS_ENVIRONMENT} ../../admin/ktutil" diff --git a/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in index e88e5bc57..b0a3e2464 100644 --- a/tests/gss/check-gssmask.in +++ b/tests/gss/check-gssmask.in @@ -47,7 +47,7 @@ R=TEST.H5L.SE port=@port@ -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" keytabfile=${objdir}/server.keytab keytab="FILE:${keytabfile}" diff --git a/tests/gss/check-nodns.in b/tests/gss/check-nodns.in index 9718fd767..e9ac14225 100644 --- a/tests/gss/check-nodns.in +++ b/tests/gss/check-nodns.in @@ -54,7 +54,7 @@ cache="FILE:krb5ccfile" cache2="FILE:krb5ccfile2" nocache="FILE:no-such-cache" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=127.0.0.1 -P $port" acquire_cred="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_acquire_cred_auditdns" diff --git a/tests/gss/check-spnego.in b/tests/gss/check-spnego.in index 69f28200b..e26b46290 100644 --- a/tests/gss/check-spnego.in +++ b/tests/gss/check-spnego.in @@ -54,7 +54,7 @@ cacheds="FILE:krb5ccfile-ds" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog} --forwardable" kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds ${afs_no_afslog}" -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" context="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_context" diff --git a/tests/java/check-kinit.in b/tests/java/check-kinit.in index a04bd932e..627b2f361 100644 --- a/tests/java/check-kinit.in +++ b/tests/java/check-kinit.in @@ -53,7 +53,7 @@ keytab="FILE:${keytabfile}" cache="FILE:${objdir}/cache.krb5" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}" -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=127.0.0.1 -P $port" gssclient="${TESTS_ENVIRONMENT} ../../appl/test/gssapi_client" diff --git a/tests/kdc/check-bx509.in b/tests/kdc/check-bx509.in index 8f82a7230..105e70410 100644 --- a/tests/kdc/check-bx509.in +++ b/tests/kdc/check-bx509.in @@ -53,7 +53,7 @@ bx509port=@bx509port@ server=datan.test.h5l.se otherserver=other.test.h5l.se -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" bx509d="${bx509d} --allow-GET --reverse-proxied -p $bx509port -H $server --cert=${objdir}/bx509.pem -t" kdc="${kdc} --addresses=localhost -P $port" diff --git a/tests/kdc/check-canon.in b/tests/kdc/check-canon.in index ea66badc2..fead6a681 100644 --- a/tests/kdc/check-canon.in +++ b/tests/kdc/check-canon.in @@ -43,7 +43,7 @@ R3=TEST3.H5L.SE port=@port@ -kadmin="${kadmin} -l -r ${R1}" +kadmin="${kadmin} -l -A -r ${R1}" kdc="${kdc} --addresses=localhost -P $port" cache="FILE:${objdir}/cache.krb5" diff --git a/tests/kdc/check-cc.in b/tests/kdc/check-cc.in index d6d6a91a6..05329db7a 100644 --- a/tests/kdc/check-cc.in +++ b/tests/kdc/check-cc.in @@ -53,7 +53,7 @@ pwport=@pwport@ kinit="${kinit} --password-file=${objdir}/foopassword ${afs_no_afslog}" kdestroy="${kdestroy} ${afs_no_unlog}" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-delegation.in b/tests/kdc/check-delegation.in index 945cd28da..5ec749986 100644 --- a/tests/kdc/check-delegation.in +++ b/tests/kdc/check-delegation.in @@ -46,7 +46,7 @@ R4=TEST4.H5L.SE port=@port@ -kadmin="${kadmin} -l -r ${R}" +kadmin="${kadmin} -l -A -r ${R}" kdc="${kdc} --addresses=localhost -P $port" server=host/datan.test4.h5l.se@TEST4.H5L.ORG diff --git a/tests/kdc/check-des.in b/tests/kdc/check-des.in index f36f0c9ca..5a3dfc1e4 100644 --- a/tests/kdc/check-des.in +++ b/tests/kdc/check-des.in @@ -47,7 +47,7 @@ R2=TEST2.H5L.SE port=@port@ -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" afsserver=afs/test.h5l.se diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in index 4bf462592..2fe5ebd01 100644 --- a/tests/kdc/check-digest.in +++ b/tests/kdc/check-digest.in @@ -47,7 +47,7 @@ R=TEST.H5L.SE port=@port@ -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-fast.in b/tests/kdc/check-fast.in index 0cbc14650..c2a5441df 100644 --- a/tests/kdc/check-fast.in +++ b/tests/kdc/check-fast.in @@ -49,7 +49,7 @@ R=TEST.H5L.SE port=@port@ -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-hdb-mitdb.in b/tests/kdc/check-hdb-mitdb.in index 4ab408936..c081e8232 100644 --- a/tests/kdc/check-hdb-mitdb.in +++ b/tests/kdc/check-hdb-mitdb.in @@ -58,7 +58,7 @@ R=TEST.H5L.SE port=@port@ -kadmin="${kadmin} -l -r $R --config-file=${KRB5_CONFIG}" +kadmin="${kadmin} -l -A -r $R --config-file=${KRB5_CONFIG}" kdc="${kdc} --addresses=localhost -P $port" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-httpkadmind.in b/tests/kdc/check-httpkadmind.in index 16d4402b2..759bdc9d5 100644 --- a/tests/kdc/check-httpkadmind.in +++ b/tests/kdc/check-httpkadmind.in @@ -76,11 +76,11 @@ ukeytab=FILE:${ukt} kdc="${kdc} --addresses=localhost -P $port" kadminr="${kadmin} -r $R -a $(uname -n)" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kadmind2="${kadmind} --keytab=${keytab} --detach -p $admport2 --read-only" -kadmind="${kadmind} --keytab=${keytab} --detach -p $admport" -httpkadmind2="${httpkadmind} --reverse-proxied -T Negotiate -p $restport2" -httpkadmind="${httpkadmind} --reverse-proxied -T Negotiate -p $restport1" +kadmind="${kadmind} -A --keytab=${keytab} --detach -p $admport" +httpkadmind2="${httpkadmind} -A --reverse-proxied -T Negotiate -p $restport2" +httpkadmind="${httpkadmind} -A --reverse-proxied -T Negotiate -p $restport1" kinit2="${kinit} -c $cache2 ${afs_no_afslog}" kinit="${kinit} -c $cache ${afs_no_afslog}" diff --git a/tests/kdc/check-kadmin.in b/tests/kdc/check-kadmin.in index 077b9df3e..15dac088e 100644 --- a/tests/kdc/check-kadmin.in +++ b/tests/kdc/check-kadmin.in @@ -51,7 +51,7 @@ cache="FILE:${objdir}/cache.krb5" kadmin="${kadmin} -r $R" kdc="${kdc} --addresses=localhost -P $port" -kadmind="${kadmind} -p $admport" +kadmind="${kadmind} -A -p $admport" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in index 595b5b219..523f35723 100644 --- a/tests/kdc/check-kdc.in +++ b/tests/kdc/check-kdc.in @@ -70,7 +70,7 @@ port=@port@ pwport=@pwport@ kadmin5="${kadmin} -l -r $R5" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" kpasswdd="${kpasswdd} --addresses=localhost -p $pwport" diff --git a/tests/kdc/check-kinit.in b/tests/kdc/check-kinit.in index c85701c04..97fc7e8f3 100644 --- a/tests/kdc/check-kinit.in +++ b/tests/kdc/check-kinit.in @@ -55,7 +55,7 @@ kinit="${kinit} --password-file=${objdir}/foopassword ${afs_no_afslog} -c ${objd klist="${klist} -c ${objdir}/foocc" kgetcred="${kgetcred} -c ${objdir}/foocc" kdestroy="${kdestroy} ${afs_no_unlog}" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" diff --git a/tests/kdc/check-kpasswdd.in b/tests/kdc/check-kpasswdd.in index 2640000df..d7b581441 100644 --- a/tests/kdc/check-kpasswdd.in +++ b/tests/kdc/check-kpasswdd.in @@ -51,7 +51,7 @@ R2=TEST2.H5L.SE port=@port@ pwport=@pwport@ -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" kpasswdd="${kpasswdd} --addresses=localhost -p $pwport" diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in index 066d8e372..d278739e3 100644 --- a/tests/kdc/check-pkinit.in +++ b/tests/kdc/check-pkinit.in @@ -46,7 +46,7 @@ R=TEST.H5L.SE port=@port@ -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" kdc="${kdc} --addresses=localhost -P $port" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-tester.in b/tests/kdc/check-tester.in index fa5ef006b..d528c979a 100644 --- a/tests/kdc/check-tester.in +++ b/tests/kdc/check-tester.in @@ -56,7 +56,7 @@ keytab="FILE:${keytabfile}" keyfile="${hx509_data}/key.der" keyfile2="${hx509_data}/key2.der" -kadmin="${kadmin} -l -r $R" +kadmin="${kadmin} -l -A -r $R" server=host/datan.test.h5l.se diff --git a/tests/kdc/check-uu.in b/tests/kdc/check-uu.in index 781715682..777f787bb 100644 --- a/tests/kdc/check-uu.in +++ b/tests/kdc/check-uu.in @@ -48,7 +48,7 @@ uuspid= port=@port@ -kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" +kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -A -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" cache1="FILE:${objdir}/cache1.krb5"