selftest: Rename ntlmauth tests to ntlmdisabled

There are already some existing ntlm_auth tests, so the new tests I've
added make things a bit confusing. Also, ntlmdisabled probably better
reflects the specific case we're trying to test.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/tests/ntlmauth.py b/python/samba/tests/ntlmdisabled.py
similarity index 90%
rename from python/samba/tests/ntlmauth.py
rename to python/samba/tests/ntlmdisabled.py
index a232bf260121baeff3120744af46bff5950dd869..90341a5cee3534b6c7a23c40058bc19694600365 100644 (file)
--- a/python/samba/tests/ntlmauth.py
+++ b/python/samba/tests/ntlmdisabled.py
@@ -1,4 +1,4 @@
-# Tests to check basic NTLM authentication
+# Tests basic behaviour when NTLM is disabled
 #
 # Copyright (C) Catalyst IT Ltd. 2017
 #
@@ -28,13 +28,13 @@ from samba import credentials
 from samba.dcerpc import srvsvc, samr, lsa
 
 """
-Tests basic NTLM authentication
+Tests behaviour when NTLM is disabled
 """
 
-class NtlmAuthTests(TestCase):
+class NtlmDisabledTests(TestCase):
 
     def setUp(self):
-        super(NtlmAuthTests, self).setUp()
+        super(NtlmDisabledTests, self).setUp()
 
         self.lp          = self.get_loadparm()
         self.server      = os.getenv("SERVER")
@@ -47,7 +47,7 @@ class NtlmAuthTests(TestCase):
         self.creds.set_kerberos_state(DONT_USE_KERBEROS)
 
     def tearDown(self):
-        super(NtlmAuthTests, self).tearDown()
+        super(NtlmDisabledTests, self).tearDown()
 
     def test_ntlm_connection(self):
         try:
@@ -76,7 +76,7 @@ class NtlmAuthTests(TestCase):
         try:
             conn.ChangePasswordUser2(server, username, None, None, True, None, None)
         except NTSTATUSError as e:
-            # changing passwords is rejected when NTLM is disabled
+            # changing passwords should be rejected when NTLM is disabled
             enum = ctypes.c_uint32(e[0]).value
             if enum == ntstatus.NT_STATUS_NTLM_BLOCKED:
                 self.fail("NTLM is disabled on this server")

diff --git a/selftest/knownfail b/selftest/knownfail
index 80de242b14db40492c6390dcee8971d9628a2488..15e6b1d5c70df9560d0d9645b0647e168d223241 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -333,8 +333,8 @@
 ^samba.tests.netlogonsvc.python\(simpleserver\)
 ^samba.tests.netlogonsvc.python\(fileserver\)
 # NTLM authentication is (intentionally) disabled in ktest
-^samba.tests.ntlmauth.python\(ktest\).ntlmauth.NtlmAuthTests.test_ntlm_connection\(ktest\)
-^samba.tests.ntlmauth.python\(ad_dc_no_ntlm\).ntlmauth.NtlmAuthTests.test_samr_change_password\(ad_dc_no_ntlm\)
+^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ktest\)
+^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ad_dc_no_ntlm\)
 # Disabling NTLM means you can't use samr to change the password
-^samba.tests.ntlmauth.python\(ktest\).ntlmauth.NtlmAuthTests.test_samr_change_password\(ktest\)
-^samba.tests.ntlmauth.python\(ad_dc_no_ntlm\).ntlmauth.NtlmAuthTests.test_ntlm_connection\(ad_dc_no_ntlm\)
+^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\)
+^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index c7150d05c1456a407055de292d9b2831f1658366..cdc62cd362b482d2d427cb0acec1c31fdbd72de0 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -965,9 +965,9 @@ for env in [ "simpleserver", "fileserver", "nt4_dc", "ad_dc", "ad_dc_ntvfs", "ad
                            name="samba.tests.netlogonsvc.python(%s)" % env)
 
 for env in [ "ktest", "ad_member", "ad_dc_no_ntlm" ]:
-    planoldpythontestsuite(env, "ntlmauth",
+    planoldpythontestsuite(env, "ntlmdisabled",
                            extra_path=[os.path.join(srcdir(), 'python/samba/tests')],
-                           name="samba.tests.ntlmauth.python(%s)" % env)
+                           name="samba.tests.ntlmdisabled.python(%s)" % env)
 
 # Demote the vampire DC, it must be the last test each DC, before the dbcheck
 for env in ['vampire_dc', 'promoted_dc', 'rodc']: