summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-11 17:02:36 +0200
committerAndreas Schneider <asn@samba.org>2011-08-01 08:50:35 +0200
commite0931a53c894e9d267c2d4b5d1b667209f9540ab (patch)
treeea2f6da6cb7cfa100b237fc79ab745f6f2eda0e6
parent48542728b11db3227fe821463f7d6b2230ae608b (diff)
downloadsamba-e0931a53c894e9d267c2d4b5d1b667209f9540ab.tar.gz
samba-e0931a53c894e9d267c2d4b5d1b667209f9540ab.tar.bz2
samba-e0931a53c894e9d267c2d4b5d1b667209f9540ab.zip
s3-torture: Run epmapper as daemon and the tests over ncalrpc.
-rw-r--r--selftest/target/Samba3.pm2
-rwxr-xr-xsource3/selftest/tests.py9
2 files changed, 9 insertions, 2 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 93b999fbb4..418240b061 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -900,7 +900,7 @@ sub provision($$$$$$$)
lpq cache time = 0
ncalrpc dir = $prefix_abs/ncalrpc
- rpc_server:epmapper = embedded
+ rpc_server:epmapper = daemon
resolv:host file = $dns_host_file
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index df6e44df38..cd0318c3e4 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -183,7 +183,7 @@ rpc = ["rpc.authcontext", "rpc.samba3.bind", "rpc.samba3.srvsvc", "rpc.samba3.sh
"rpc.samr", "rpc.samr.users", "rpc.samr.users.privileges", "rpc.samr.passwords",
"rpc.samr.passwords.pwdlastset", "rpc.samr.large-dc", "rpc.samr.machine.auth",
"rpc.netlogon.admin",
- "rpc.schannel", "rpc.schannel2", "rpc.bench-schannel1", "rpc.join", "rpc.bind", "rpc.epmapper"]
+ "rpc.schannel", "rpc.schannel2", "rpc.bench-schannel1", "rpc.join", "rpc.bind"]
local = ["local.nss-wrapper", "local.ndr"]
@@ -250,3 +250,10 @@ if sub.returncode == 0:
binding_string = "ncacn_ip_tcp:$SERVER_IP[%s%s%s]" % (a, s, e)
options = binding_string + " -U$USERNAME%$PASSWORD"
plansmbtorturetestsuite(test, "s3dc", options, 'over ncacn_ip_tcp with [%s%s%s] ' % (a, s, e))
+
+ test = 'rpc.epmapper'
+ env = 's3dc:local'
+ binding_string = 'ncalrpc:'
+ options = binding_string + " -U$USERNAME%$PASSWORD"
+
+ plansmbtorturetestsuite(test, env, options, 'over ncalrpc')