svn commit: samba r22170 - in branches/SAMBA_4_0: source/script/tests testprogs/blackbox

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-11 12:10:40 +0000 (Wed, 11 Apr 2007)
New Revision: 22170

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22170

Log:
To get the smbclient blackbox test to pass again, we need to get the
private dir to contain a valid machine account.

It isn't really valid it use the DC's account any more, so extend this
script to also join the domain.  This nicely tests out some previously
untested code too!

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.pl
   branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-11 11:43:07 UTC (rev 22169)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-11 12:10:40 UTC (rev 22170)
@@ -448,6 +448,14 @@
 
 	my $abs_srcdir = cwd();
 
+	mkdir "$prefix/client" unless -d "$prefix/client";
+	
+	if ( -d "$prefix/client/private" ) {
+	        unlink <$prefix/client/private/*>;
+	} else {
+	        mkdir("$prefix/client/private");
+	}
+
 	open(CF, ">$conffile");
 	print CF "[global]\n";
 	if (defined($ENV{VALGRIND})) {
@@ -456,8 +464,7 @@
 		print CF "\ticonv:native = false\n";
 	}
 	print CF 
-"	netbios name = localtest
-	netbios aliases = localhost
+"	netbios name = client
 ";
 	if (defined($vars->{DOMAIN})) {
 		print CF "\tworkgroup = $vars->{DOMAIN}\n";
@@ -465,9 +472,6 @@
 	if (defined($vars->{REALM})) {
 		print CF "\trealm = $vars->{REALM}\n";
 	}
-	if (defined($vars->{PIDDIR})) {
-		print CF "\tpid directory = $vars->{PIDDIR}\n";
-	}
 	if (defined($vars->{NCALRPCDIR})) {
 		print CF "\tncalrpc dir = $vars->{NCALRPCDIR}\n";
 	}
@@ -475,6 +479,7 @@
 		print CF "\twinbindd socket directory = $vars->{WINBINDD_SOCKET_DIR}\n";
 	}
 	print CF "
+        private dir = $abs_srcdir/$prefix/client/private
 	js include = $abs_srcdir/scripting/libjs
 	name resolve order = bcast
 	interfaces = $interfaces
@@ -483,8 +488,8 @@
 	notify:inotify = false
 	ldb:nosync = true
 	system:anonymous = true
+	torture:basedir = ./st
 #We don't want to pass our self-tests if the PAC code is wrong
-	torture:basedir = ./st
 	gensec:require_pac = true
 ";
 	close(CF);

Modified: branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh
===================================================================
--- branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh	2007-04-11 11:43:07 UTC (rev 22169)
+++ branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh	2007-04-11 12:10:40 UTC (rev 22170)
@@ -37,6 +37,8 @@
 	return $?
 }
 
+testit "domain join" $VALGRIND bin/net join $DOMAIN $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
 # Generate random file
 cat >tmpfile<<EOF
 foo