[PATCH] selftest: Tweak PSO test-suite name

[Tim Beale]

Rebased, updated patch attached.

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

On 17/09/18 05:30, Andrew Bartlett wrote:
> On Fri, 2018-09-14 at 12:45 +1200, Tim Beale via samba-technical wrote:
>> 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.
> A good idea. 
>
> Sadly it looks like this conflicts with the PY3 changes from Noel that
> I just merged.
>
> Sorry,
>
> Andrew Bartlett
>

-------------- next part --------------
From 2368fecc89a987ad67b3d8d6a66c80b1fbf715bf Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
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 <timbeale at catalyst.net.nz>
---
 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 7525b20..c733c23 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 1803752..a305ef6 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)
 
-- 
2.7.4