s3/selftest: move samba3.blackbox.smbspool to ad_dc_smb1

and remove entry from skip_smb1_fail

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 9047f88bcf5855ac38ee1c55679b1a800c40d237..55d6ea003bdda8e8d3c86e69929d34469c5d3943 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -87,7 +87,6 @@
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign\(nt4_dc\)
-^samba3.blackbox.smbspool\(ad_dc\)
 ^samba3.rap.basic\(ad_dc\)
 ^samba3.rap.basic\(nt4_dc\)
 ^samba3.rap.rpc\(ad_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index f7d22f9aa8652fa28ea65ce40898d06f31946f4a..44de417c55fc29d883d912420b683ce68ba35730 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -266,7 +266,7 @@ for env in ["nt4_member", "ad_member"]:
     plantestsuite("samba3.blackbox.smbclient_auth.upn.domain_creds", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME@$REALM', '$DC_PASSWORD', smbclient3, configuration, options])
     plantestsuite("samba3.blackbox.smbclient_auth.upn.member_creds", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME@$SERVER', '$PASSWORD', smbclient3, configuration, options])
 
-env = "ad_dc"
+env = "ad_dc_smb1"
 plantestsuite("samba3.blackbox.smbspool", env, [os.path.join(samba3srcdir, "script/tests/test_smbspool.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', env])
 
 for env in ["ad_member:local", "nt4_dc:local"]: