[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1969-g2b5acb5

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  2b5acb5e95b46dd39c6f54b5bb7e15ddb180f7ec (commit)
       via  e2fa3788110698cd3340dfed8acd36744a27a5e5 (commit)
      from  df8399ba9dee9d1c706a3e56451c9f2cade96dae (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 2b5acb5e95b46dd39c6f54b5bb7e15ddb180f7ec
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri May 30 15:26:10 2008 +1000

    Fix the samba4.dcerpc.bare.python test.
    
    The loadparm context isn't really optional, as otherwise we can't find
    the right server to connect to.
    
    Andrew Bartlett

commit e2fa3788110698cd3340dfed8acd36744a27a5e5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri May 30 15:21:40 2008 +1000

    Place the NTP signd socket in the selftest area

-----------------------------------------------------------------------

Summary of changes:
 source/scripting/python/samba/tests/dcerpc/bare.py |   11 ++++++-----
 source/selftest/target/Samba4.pm                   |    2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/python/samba/tests/dcerpc/bare.py b/source/scripting/python/samba/tests/dcerpc/bare.py
index d75ffc3..fae699a 100644
--- a/source/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source/scripting/python/samba/tests/dcerpc/bare.py
@@ -20,27 +20,28 @@
 
 from samba.dcerpc import ClientConnection
 from unittest import TestCase
+from samba.tests import cmdline_loadparm
 
 class BareTestCase(TestCase):
     def test_bare(self):
         # Connect to the echo pipe
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=cmdline_loadparm)
         self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_alter_context(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("12345778-1234-abcd-ef00-0123456789ac", 1))
+                ("12345778-1234-abcd-ef00-0123456789ac", 1), lp_ctx=cmdline_loadparm)
         y = ClientConnection("ncalrpc:localhost", 
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
-                basis_connection=x)
+                basis_connection=x, lp_ctx=cmdline_loadparm)
         x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1))
         # FIXME: self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_two_connections(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=cmdline_loadparm)
         y = ClientConnection("ncalrpc:localhost", 
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
-                basis_connection=x)
+                basis_connection=x, lp_ctx=cmdline_loadparm)
         self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4))
diff --git a/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index a12939b..9f771ab 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/selftest/target/Samba4.pm
@@ -521,6 +521,7 @@ sub provision($$$$$$)
 	my $ncalrpcdir = "$prefix_abs/ncalrpc";
 	my $lockdir = "$prefix_abs/lockdir";
 	my $winbindd_socket_dir = "$prefix_abs/winbind_socket";
+	my $ntp_signd_socket_dir = "$prefix_abs/ntp_signd_socket";
 	my $winbindd_priv_pipe_dir = "$privatedir/smbd.tmp/winbind_pipe";
 	my $nsswrap_passwd = "$etcdir/passwd";
 	my $nsswrap_group = "$etcdir/group";
@@ -556,6 +557,7 @@ sub provision($$$$$$)
 	modules dir = $self->{bindir}/modules
 	js include = $srcdir/scripting/libjs
 	winbindd socket directory = $winbindd_socket_dir
+	ntp signd socket directory = $ntp_signd_socket_dir
         winbind separator = /
 	name resolve order = bcast
 	interfaces = $interfaces


-- 
Samba Shared Repository