From: Andrew Bartlett Date: Sat, 12 Feb 2022 01:09:34 +0000 (+1300) Subject: selftest: Remove duplicate run of rpc.lsa tests against ad_dc as "samba3" X-Git-Tag: tevent-0.12.0~413 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e21be7e89c52aa94d151dd3929f53e22a45245c;p=thirdparty%2Fsamba.git selftest: Remove duplicate run of rpc.lsa tests against ad_dc as "samba3" Running these tests twice is a waste (sorry, thas was my choice when merging s3 and s4 to just run all the tests against the AD DC) and more importantly means that tests are run in "samba3" mode against the AD DC, making it difficult to change the tests to expect a different behaivour against the AD DC compared to the NT4 DC. To assure that we have not lost tests, I ran: grep command st/subunit | grep ad_dc| cut -f 2 -d\" | cut -f 2- -d. | sort | uniq -c The two blocks (for rpc.lsa and rpc.lsa.*) are because the rpc.lsa.* subtests were not previously run under ncacn_ip_tcp: and this is the minimal change. The output is: --- /tmp/3 2022-02-12 14:01:50.435761067 +1300 +++ /tmp/now 2022-02-12 14:01:37.427595351 +1300 @@ -13,9 +13,8 @@ 2 rpc.lsa-getuser on ncalrpc with validate. 2 rpc.lsa-getuser with bigendian. 2 rpc.lsa-getuser with seal,padcheck. 2 rpc.lsa-getuser with validate. - 2 rpc.lsa.lookupnames. 2 rpc.lsa.lookupnames with . 2 rpc.lsa.lookupnames with bigendian. 2 rpc.lsa.lookupnames with validate. 2 rpc.lsalookup on ncacn_ip_tcp with bigendian. @@ -26,9 +25,8 @@ 2 rpc.lsalookup on ncacn_np with validate. 2 rpc.lsalookup on ncalrpc with bigendian. 2 rpc.lsalookup on ncalrpc with seal,padcheck. 2 rpc.lsalookup on ncalrpc with validate. - 2 rpc.lsa.lookupsids. 2 rpc.lsa.lookupsids with . 2 rpc.lsa.lookupsids with bigendian. 2 rpc.lsa.lookupsids with validate. 2 rpc.lsalookup with bigendian. @@ -42,15 +40,11 @@ 2 rpc.lsa on ncacn_np with validate. 2 rpc.lsa on ncalrpc with bigendian. 2 rpc.lsa on ncalrpc with seal,padcheck. 2 rpc.lsa on ncalrpc with validate. - 2 rpc.lsa over ncacn_ip_tcp . - 2 rpc.lsa over ncacn_np . - 2 rpc.lsa.privileges. 2 rpc.lsa.privileges with . 2 rpc.lsa.privileges with bigendian. 2 rpc.lsa.privileges with validate. - 2 rpc.lsa.secrets. 2 rpc.lsa.secrets on ncacn_np with with -k no --option=clientusespnego=no. 2 rpc.lsa.secrets on ncacn_np with with -k no --option=clientusespnego=no --option=clientntlmv2auth=yes. 2 rpc.lsa.secrets on ncacn_np with with -k no --option=clientusespnego=yes. 2 rpc.lsa.secrets on ncacn_np with with -k no --option=clientusespnego=yes --option=clientntlmv2auth=yes. Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index c48c50336b7..5849d39445a 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -845,8 +845,10 @@ for t in tests: elif t == "rpc.lsa": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ') plansmbtorture4testsuite(t, "nt4_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ') - plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ') - plansmbtorture4testsuite(t, "ad_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ') + elif t.startswith("rpc.lsa."): + # This avoids the rpc.lsa.* tests runing under ncacn_ip_tcp: + # (there is rpc.lsa.secrets fails due to OpenPolicy2 for example) + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') elif t == "rpc.mdssvc": plansmbtorture4testsuite(t, "fileserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:no_spotlight_localdir=$SELFTEST_PREFIX/fileserver/share') elif t == "smb2.durable-open" or t == "smb2.durable-v2-open" or t == "smb2.replay" or t == "smb2.durable-v2-delay":