From e362ad23ee61541c88d2733b91379d995ca900c9 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 16 Dec 2019 17:43:58 +0000 Subject: [PATCH] s4/selftest: Move samba4.ldap.passwordsettings to ad_dc_default_smb1 Test samba4.ldap.passwordsettings fails when run against test env that doesn't support SMB1 so move to ad_dc_default_smb1 Note: no skip entries to be removed as tests are known failures Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/knownfail.d/password_settings | 6 +++--- source4/selftest/tests.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selftest/knownfail.d/password_settings b/selftest/knownfail.d/password_settings index 91093fe644d..4f708e64707 100644 --- a/selftest/knownfail.d/password_settings +++ b/selftest/knownfail.d/password_settings @@ -1,4 +1,4 @@ # highlights a minor corner-case discrepancy between Windows and Samba -samba4.ldap.passwordsettings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default\) -samba4.ldap.passwordsettings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default\) -samba4.ldap.passwordsettings.python.python2.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default\) +samba4.ldap.passwordsettings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default_smb1\) +samba4.ldap.passwordsettings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default_smb1\) +samba4.ldap.passwordsettings.python.python2.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default_smb1\) diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 6e217cc9b63..0ef98722ca5 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -1025,7 +1025,7 @@ planoldpythontestsuite("rodc:local", "replica_sync_rodc", environ={'DC1': '$DC_SERVER', 'DC2': '$SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) -planoldpythontestsuite("ad_dc_default", "password_settings", +planoldpythontestsuite("ad_dc_default_smb1", "password_settings", extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')], name="samba4.ldap.passwordsettings.python", extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) -- 2.47.3