[PATCH] selftest: Tweak PSO test-suite name

Tim Beale timbeale at catalyst.net.nz
Fri Sep 14 00:45:00 UTC 2018


Fixes up minor discrepancy in test-suite name, to make it easier to run
via 'make test'. See attached.

CI link: https://gitlab.com/catalyst-samba/samba/pipelines/30068656

Review appreciated.

-------------- next part --------------
From d40ecd84641759ea1991761072f55167921740db Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Thu, 13 Sep 2018 17:07:05 +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 <timbeale at catalyst.net.nz>
---
 selftest/knownfail.d/password_settings | 2 +-
 source4/selftest/tests.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/selftest/knownfail.d/password_settings b/selftest/knownfail.d/password_settings
index bbca928..155d2e1 100644
--- a/selftest/knownfail.d/password_settings
+++ b/selftest/knownfail.d/password_settings
@@ -1,3 +1,3 @@
 # 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.passwordsettings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\)
 
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 83efeab..4e7d8b9 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -872,7 +872,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'])
 
 for env in ["ad_dc_ntvfs", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
-- 
2.7.4



More information about the samba-technical mailing list