From 188541076a1a19acb8a3dd572a5bd4f69350cf41 Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Thu, 20 Sep 2018 13:46:32 +1200 Subject: [PATCH] selftest: Tweak PSO test-suite name There are 2 different PSO tests: - make test TESTS=ldap.password_settings - make test TESTS=samba_tool.passwordsettings There's also another test that's completely unrelated to PSOs: - make test TESTS=blackbox.password_settings This patch renames ldap.password_settings --> ldap.passwordsettings. This means 'make test TESTS=passwordsettings' will run both PSO tests, but not the unrelated blackbox test. Signed-off-by: Tim Beale Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Sep 21 22:58:17 CEST 2018 on sn-devel-144 --- selftest/knownfail.d/password_settings | 4 ++-- source4/selftest/tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selftest/knownfail.d/password_settings b/selftest/knownfail.d/password_settings index 7525b204e16..c733c238f81 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.password_settings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\) -samba4.ldap.password_settings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\) +samba4.ldap.passwordsettings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\) +samba4.ldap.passwordsettings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\) diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 18037524627..a305ef62af5 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -875,7 +875,7 @@ planoldpythontestsuite("rodc:local", "replica_sync_rodc", planoldpythontestsuite("ad_dc_ntvfs", "password_settings", extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')], - name="samba4.ldap.password_settings.python", + name="samba4.ldap.passwordsettings.python", extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], py3_compatible=True)