Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

2 files changed, 186 insertions, 5 deletions

diff --git a/source/selftest/target/Kvm.pm b/source/selftest/target/Kvm.pm
new file mode 100644
index 00000000000..3b17a2909c6
--- /dev/null
+++ b/source/selftest/target/Kvm.pm
@@ -0,0 +1,167 @@
+#!/usr/bin/perl
+# Start a KVM machine and run a number of tests against it.
+# Copyright (C) 2005-2008 Jelmer Vernooij <jelmer@samba.org>
+# Published under the GNU GPL, v3 or later.
+
+package Kvm;
+
+use strict;
+use Cwd qw(abs_path);
+use FindBin qw($RealBin);
+use POSIX;
+
+sub new($$$$) {
+	my ($classname, $dc_image, $vdesocket) = @_;
+	my $self = { 
+		dc_image => $dc_image,
+		vdesocket => $vdesocket,
+	};
+	bless $self;
+	return $self;
+}
+
+sub write_kvm_ifup($$$)
+{
+	my ($self, $path, $ip_prefix) = @_;
+	open(SCRIPT, ">$path/kvm-ifup");
+
+	print SCRIPT <<__EOF__;
+#!/bin/sh
+
+PREFIX=$ip_prefix
+
+/sbin/ifconfig \$1 \$PREFIX.1 up
+
+cat <<EOF>$path/udhcpd.conf
+interface \$1
+start 		\$PREFIX.20
+end		\$PREFIX.20
+max_leases 1
+lease_file	$path/udhcpd.leases
+pidfile	$path/udhcpd.pid
+EOF
+
+touch $path/udhcpd.leases
+
+/usr/sbin/udhcpd $path/udhcpd.conf
+
+exit 0
+__EOF__
+	close(SCRIPT);
+	chmod(0755, "$path/kvm-ifup");
+
+	return ("$path/kvm-ifup", "$path/udhcpd.pid", "$ip_prefix.20");
+}
+
+sub teardown_env($$)
+{
+	my ($self, $envvars) = @_;
+
+	print "Killing kvm instance $envvars->{KVM_PID}\n";
+
+	kill 9, $envvars->{KVM_PID};
+
+	if (defined($envvars->{DHCPD_PID})) {
+		print "Killing dhcpd instance $envvars->{DHCPD_PID}\n";
+		kill 9, $envvars->{DHCPD_PID};
+	}
+
+	return 0;
+}
+
+sub getlog_env($$)
+{
+	my ($self, $envvars) = @_;
+
+	return "";
+}
+
+sub check_env($$)
+{
+	my ($self, $envvars) = @_;
+
+	# FIXME: Check whether $self->{pid} is still running
+
+	return 1;
+}
+
+sub read_pidfile($)
+{
+	my ($path) = @_;
+
+	open(PID, $path);
+	<PID> =~ /([0-9]+)/;
+	my ($pid) = $1;
+	close(PID);
+	return $pid;
+}
+
+sub start($$$)
+{
+	my ($self, $path, $image) = @_;
+
+	my $pidfile = "$path/kvm.pid";
+
+	my $opts = (defined($ENV{KVM_OPTIONS})?$ENV{KVM_OPTIONS}:"-nographic");
+
+	if (defined($ENV{KVM_SNAPSHOT})) {
+		$opts .= " -loadvm $ENV{KVM_SNAPSHOT}";
+	}
+
+	my $netopts;
+	my $dhcp_pid;
+	my $ip_address;
+
+	if ($self->{vdesocket}) {
+		$netopts = "vde,socket=$self->{vdesocket}";
+	} else {
+		my $ifup_script, $dhcpd_pidfile;
+		($ifup_script, $dhcpd_pidfile, $ip_address) = $self->write_kvm_ifup($path, "192.168.9");
+		$netopts = "tap,script=$ifup_script";
+		$dhcp_pid = read_pidfile($dhcpd_pidfile);
+	}
+
+	system("kvm -name \"Samba 4 Test Subject\" $opts -monitor unix:$path/kvm.monitor,server,nowait -daemonize -pidfile $pidfile -snapshot $image -net nic -net $netopts");
+
+	return (read_pidfile($pidfile), $dhcp_pid, $ip_address);
+}
+
+sub setup_env($$$)
+{
+	my ($self, $envname, $path) = @_;
+
+	if ($envname eq "dc") {
+		($self->{dc_pid}, $self->{dc_dhcpd_pid}, $self->{dc_ip}) = $self->start($path, $self->{dc_image});
+
+		sub choose_var($$) { 
+			my ($name, $default) = @_; 
+			return defined($ENV{"KVM_DC_$name"})?$ENV{"KVM_DC_$name"}:$default; 
+		}
+
+		if ($envname eq "dc") {
+			return {
+				KVM_PID => $self->{dc_pid},
+				DHCPD_PID => $self->{dc_dhcpd_pid},
+				USERNAME => choose_var("USERNAME", "Administrator"),
+				PASSWORD => choose_var("PASSWORD", "penguin"),
+				DOMAIN => choose_var("DOMAIN", "SAMBA"), 
+				REALM => choose_var("REALM", "SAMBA"), 
+				SERVER => choose_var("SERVER", "DC"), 
+				SERVER_IP => $self->{dc_ip},
+				NETBIOSNAME => choose_var("NETBIOSNAME", "DC"), 
+				NETBIOSALIAS => choose_var("NETBIOSALIAS", "DC"), 
+			};
+		} else {
+			return undef;
+		}
+	} else {
+		return undef;
+	}
+}
+
+sub stop($)
+{
+	my ($self) = @_;
+}
+
+1;
diff --git a/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 87a86ef06fe..563aca876e0 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/selftest/target/Samba4.pm
@@ -525,7 +525,7 @@ sub provision($$$$$$)
 
 	(system("rm -rf $prefix/*") == 0) or die("Unable to clean up");
 	mkdir($_, 0777) foreach ($privatedir, $etcdir, $piddir, $ncalrpcdir, $lockdir, 
-		$tmpdir);
+		$tmpdir, "$tmpdir/test1", "$tmpdir/test2");
 
 
 	my $localbasedn = $basedn;
@@ -569,6 +569,20 @@ sub provision($$$$$$)
 	posix:sharedelay = 100000
 	posix:eadb = $lockdir/eadb.tdb
 
+[test1]
+	path = $tmpdir/test1
+	read only = no
+	ntvfs handler = posix
+	posix:sharedelay = 100000
+	posix:eadb = $lockdir/eadb.tdb
+
+[test2]
+	path = $tmpdir/test2
+	read only = no
+	ntvfs handler = posix
+	posix:sharedelay = 100000
+	posix:eadb = $lockdir/eadb.tdb
+
 [cifs]
 	read only = no
 	ntvfs handler = cifs
@@ -660,12 +674,12 @@ nogroup:x:65534:nobody
 	my @provision_options = ();
 	push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
 	push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\"");
-	if (defined($ENV{PROVISION_PYTHON})) {
-		push (@provision_options, "$self->{bindir}/smbpython");
-		push (@provision_options, "$self->{setupdir}/provision.py");
-	} else {
+	if (defined($ENV{PROVISION_EJS})) {
 		push (@provision_options, "$self->{bindir}/smbscript");
 		push (@provision_options, "$self->{setupdir}/provision");
+	} else {
+		push (@provision_options, "$self->{bindir}/smbpython");
+		push (@provision_options, "$self->{setupdir}/provision.py");
 	}
 	push (@provision_options, split(' ', $configuration));
 	push (@provision_options, "--host-name=$netbiosname");