selftest: adjust skip_file (after adjusting s4member and rpc_proxy)

The orig skip file was created with *all* test environments by
default not support SMB1.

Signed-off-by: Noel Power <npower@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 817aa12765cb6ca96b544716ec482e6f91ed2b6e..cc4f2959eb391ea0fdd168d234f3c1f14613821d 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -84,8 +84,6 @@
 ^samba3.blackbox.smbclient_basic.NT1\(nt4_dc_schannel\)
 ^samba3.blackbox.smbclient_large_file -mNT1 -e NTLM\(nt4_dc:local\)
 ^samba3.blackbox.smbclient_large_file -mNT1 NTLM\(nt4_dc:local\)
-^samba3.blackbox.smbclient_machine_auth.plain \(s4member:local\)
-^samba3.blackbox.smbclient_ntlm.plain NT1\(s4member\) # SMB1 hang
 ^samba3.blackbox.smbclient_ntlm.plain NT1\(ad_dc\)
 ^samba3.blackbox.smbclient_ntlm.plain NT1\(ad_member\)
 ^samba3.blackbox.smbclient_ntlm.plain NT1\(fl2000dc\)
@@ -177,16 +175,16 @@
 ^samba3.rpc.authcontext\(nt4_dc\)
 ^samba3.rpc.join\(ad_dc\)
 ^samba3.rpc.join\(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,bigendian\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect,bigendian\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,packet\] \(nt4_dc\)
+^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect\] \(nt4_dc\)
+^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,packet,bigendian\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,sign\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,sign,bigendian\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,seal\] \(nt4_dc\)
+^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,packet\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,seal,bigendian\] \(nt4_dc\)
+^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,seal\] \(nt4_dc\)
+^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,sign,bigendian\] \(nt4_dc\)
+^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,sign\] \(nt4_dc\)
 ^samba3.rpc.samba3.bind\(ad_dc\)
 ^samba3.rpc.samba3.bind\(nt4_dc\)
 ^samba3.rpc.samba3.getusername\(ad_dc\)
@@ -375,17 +373,13 @@
 ^samba4.blackbox.pkinit\(ad_dc:local\)
 ^samba4.blackbox.samba_tool\(ad_dc_default:local\)\(ad_dc_default:local\)
 ^samba4.blackbox.smbclient\(ad_member:local\)\(ad_member:local\)
-^samba4.blackbox.smbclient against s4member server with local creds\(s4member\) # SMB1 hang (and this one didn't appear before)
 ^samba4.blackbox.smbclient\(chgdcpass:local\)\(chgdcpass:local\)
-^samba4.blackbox.smbclient\(s4member:local\) # SMB1 hang (and this one didn't appear before)
 ^samba4.dfs.domain\(ad_dc\)
 ^samba4.ldap.nested-search\(ad_dc_default\)
 ^samba4.libsmbclient.list_shares.NT1\(nt4_dc\)
 ^samba4.libsmbclient.readdirplus.NT1\(nt4_dc\)
 ^samba4.libsmbclient.readdirplus_seek.NT1\(nt4_dc\)
 ^samba4.libsmbclient.readdirplus2.NT1\(nt4_dc\)
-^samba4.ntvfs.cifs.krb5.base.unlink\(rpc_proxy\) # SMB1 hang
-^samba4.ntvfs.cifs.ntlm.base.unlink\(rpc_proxy\) # SMB1 hang
 ^samba4.rpc.authcontext with bigendian\(ad_dc\)
 ^samba4.rpc.authcontext with seal,padcheck\(ad_dc\)
 ^samba4.rpc.authcontext with validate\(ad_dc\)
@@ -401,17 +395,9 @@
 ^samba4.rpc.join with bigendian\(ad_dc\)
 ^samba4.rpc.join with seal,padcheck\(ad_dc\)
 ^samba4.rpc.join with validate\(ad_dc\)
-^samba4.smb.signing disabled on with -k no --option=clientusespnego=no --signing=off domain-creds\(s4member\) # SMB1 hang (and this one didn't appear before)
 ^samba4.smb.signing disabled on with -k no --option=gensec:spengo=no --signing=off domain-creds\(ad_member\)
-^samba4.smb.signing disabled on with -k no --option=gensec:spengo=no --signing=off domain-creds\(s4member\) # SMB1 hang (and this one didn't appear before)
 ^samba4.smb.signing disabled on with -k no --signing=off domain-creds\(ad_member\)
-^samba4.smb.signing disabled on with -k no --signing=off domain-creds\(s4member\) # SMB1 hang (and this one didn't appear before)
 ^samba4.smb.signing disabled on with -k yes --signing=off domain-creds\(ad_member\)
-^samba4.smb.signing disabled on with -k yes --signing=off domain-creds\(s4member\) # SMB1 hang (and this one didn't appear before)
-^samba4.smb.signing on with -k no --option=clientusespnego=no --signing=off local-creds\(s4member\) # SMB1 hang (and this one didn't appear before)
-^samba4.smb.signing on with -k no --option=gensec:spengo=no --signing=off local-creds\(s4member\)
-^samba4.smb.signing on with -k no --signing=off local-creds\(s4member\) # SMB1 hang (and this one didn't appear before)
-^samba4.smb.signing --signing=no anon\(s4member\)
 ^samba4.smb.spnego.krb5.no_optimistic\(ad_dc\)
 ^samba4.smb.spnego.ntlmssp.no_optimistic\(ad_dc\)
 ^samba.blackbox.pdbtest\(ad_dc_default\)\(ad_dc_default:local\)