tests/ntlm_auth: Port ntlm_auth_diagnostics tests to python

Port ntlm_auth_diagnostics bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Wed Dec 19 16:21:32 CET 2018 on sn-devel-144

diff --git a/python/samba/tests/ntlm_auth.py b/python/samba/tests/ntlm_auth.py
index 5073184e72eb7505880a7028c0a108420fb78d86..c93d38a0f0fc3056fd5bfea924e99eb62dce6204 100644 (file)
--- a/python/samba/tests/ntlm_auth.py
+++ b/python/samba/tests/ntlm_auth.py
@@ -314,3 +314,12 @@ class NTLMAuthHelpersTests(NTLMAuthTestCase):
 
         self.assertEqual(len(lines), 5)
         self.assertEquals(lines[0], b"Authenticated: No")
+
+    def test_diagnostics(self):
+        """ ntlm_auth diagnostics """
+        cmd_line = [self.ntlm_auth_path,
+                    "--username", self.username,
+                    "--password", self.password,
+                    "--domain", self.domain,
+                    "--diagnostics"]
+        self.check_exit_code(cmd_line, 0)

diff --git a/source3/script/tests/test_ntlm_auth_diagnostics.sh b/source3/script/tests/test_ntlm_auth_diagnostics.sh
deleted file mode 100755 (executable)
index 6e0c3ee..0000000
--- a/source3/script/tests/test_ntlm_auth_diagnostics.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if [ $# -lt 1 ]; then
-cat <<EOF
-Usage: test_ntlm_auth_diagnostics.sh NTLM_AUTH DOMAIN USERNAME PASSWORD
-EOF
-exit 1;
-fi
-
-NTLM_AUTH=$1
-DOMAIN=$2
-USERNAME=$3
-PASSWORD=$4
-shift 4
-
-ADDARGS="$*"
-
-incdir=`dirname $0`/../../../testprogs/blackbox
-. $incdir/subunit.sh
-
-testit "ntlm_auth" $VALGRIND $NTLM_AUTH --domain=$DOMAIN --username=$USERNAME --password=$PASSWORD --diagnostics $ADDARGS || failed=`expr $failed + 1`
-
-testok $0 $failed

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 98c2ea89b01aa3fd3a6ad488ff7f0cf17cad5276..5218c83f25190c5c648487cd7f35900c973ff24b 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -586,10 +586,6 @@ for env in ["nt4_dc", "nt4_member", "ad_dc", "ad_member", "s4member", "chgdcpass
         "samba.wbinfo_sids2xids.(%s:local)" % env, "%s:local" % env,
         [os.path.join(samba3srcdir, "script/tests/test_wbinfo_sids2xids.sh")])
 
-    plantestsuite(
-        "samba.ntlm_auth.diagnostics(%s:local)" % env, "%s:local" % env,
-        [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), ntlm_auth3, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
-
     planpythontestsuite(env + ":local", "samba.tests.ntlm_auth", py3_compatible=True)
 
 for env in ["ktest"]: