From a626fa59cc1df3e154c062c433f3c1e1d6f87029 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 28 Jan 2008 11:28:38 +0100
Subject: ntlm_auth: Add a blackbox test. (This used to be commit
 f02b74fc067074d8e48e186a7b7255a244592f7d)

---
 source3/script/tests/test_ntlm_auth_s3.sh | 21 +++++++++++++++++++++
 source3/script/tests/tests_all.sh         |  1 +
 2 files changed, 22 insertions(+)
 create mode 100755 source3/script/tests/test_ntlm_auth_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
new file mode 100755
index 0000000000..8568da97e4
--- /dev/null
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+(/usr/bin/env python --version > /dev/null 2&>1)
+
+if $? -ne 0:
+then
+	echo "Python binary not found in path. Skipping ntlm_auth tests."
+	exit 0
+fi
+
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth || failed=`expr $failed + 1`
+# This should work even with NTLMv2
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
+
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 259e28e6e7..369cf3ebe3 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -6,6 +6,7 @@ $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 echo "Testing encrypted"
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+$SCRIPTDIR/test_ntlm_auth_s3.sh || failed=`expr $failed + $?`
 
 eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
 eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
-- 
cgit 


From 582e224af5e55909e4dfd4051f2e5b5011ec14e1 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 30 Jan 2008 16:59:40 +0100
Subject: ntlm_auth: Fix typos in the torture test script.

This should fix the build farm. Sorry, wonder why it worked on my box
before.
(This used to be commit bfa919cde57a26cd2ae7397281923792b7afe83a)
---
 source3/script/tests/test_ntlm_auth_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
index 8568da97e4..6a52e59771 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -5,9 +5,9 @@ incdir=`dirname $0`
 
 failed=0
 
-(/usr/bin/env python --version > /dev/null 2&>1)
+(/usr/bin/env python --version > /dev/null 2>&1)
 
-if $? -ne 0:
+if test $? -ne 0;
 then
 	echo "Python binary not found in path. Skipping ntlm_auth tests."
 	exit 0
-- 
cgit 


From 5b5d56d84af1657b1aec29c134af5ad6be4348eb Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 30 Jan 2008 17:57:32 +0100
Subject: ntlm_auth: test should honour configfile option to run on build farm.
 (This used to be commit 11c9c1536b153047ba387b9804f34a6555a5ae26)

---
 source3/script/tests/test_ntlm_auth_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
index 6a52e59771..6bcb3e2066 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -13,9 +13,9 @@ then
 	exit 0
 fi
 
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE || failed=`expr $failed + 1`
 # This should work even with NTLMv2
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
 
 
 testok $0 $failed
-- 
cgit 


From afaacdeb8d98420fafd6c2ae428e404e60b239f2 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 30 Jan 2008 18:34:24 +0100
Subject: ntlm_auth: Fix another typo in the test.

This _should_ be the last one.
(This used to be commit d12c49e60f4390707c924b9e9f12fa9333b006e2)
---
 source3/script/tests/test_ntlm_auth_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
index 6bcb3e2066..6c97f2e650 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -13,9 +13,9 @@ then
 	exit 0
 fi
 
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile=$CONFFILE || failed=`expr $failed + 1`
 # This should work even with NTLMv2
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile=$CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
 
 
 testok $0 $failed
-- 
cgit