selftest: run the FSRVP test suite against s3

diff --git a/selftest/knownfail b/selftest/knownfail
index fbfeae7a03968ad499d85e4b7e8816aaf0f292bc..659159f13b62247ed2c47754aed65934238902da 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -193,6 +193,7 @@
 ^samba3.raw.session.*reauth2 # maybe fix this?
 ^samba3.rpc.spoolss.printer.addprinter.driver_info_winreg # knownfail or flapping?
 ^samba3.rpc.spoolss.printer.addprinterex.driver_info_winreg # knownfail or flapping?
+^samba4.rpc.fsrvp      # fsrvp server only provided by smbd
 #
 # The following tests fail against plugin_s4_dc (aka s3fs) currently.
 # These need to be examined and either fixed or correctly categorised.

diff --git a/selftest/skip b/selftest/skip
index 50a6e0cd897e87ec1d815a9664a35e6a005f3455..1a152200c8a3601567d764d560101b8846d1d3ee 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -79,7 +79,6 @@
 ^samba4.rpc.frsapi                                                     # Not provided by Samba 4
 ^samba4.rpc.ntsvcs                                                     # Not provided by Samba 4
 ^samba4.rpc.dfs                                                                # Not provided by Samba 4
-^samba4.rpc.fsrvp                                                      # fsrvp server support not yet provided
 ^samba4.*.base.samba3.*                                                # Samba3-specific test
 ^samba4.*.raw.samba3.*                                         # Samba3-specific test
 ^samba4.rpc..*samba3.*                                         # Samba3-specific test

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 4453c4de608383776b1696bfc2493b2bf45fa51f..21e3b39eb69c7daa0ad7569ce3e28882955559ec 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -407,3 +407,4 @@ for e in endianness_options:
             plansmbtorture4testsuite(test, "s3dc", options, 'over ncacn_ip_tcp with [%s%s%s] ' % (a, s, e))
 
 plansmbtorture4testsuite('rpc.epmapper', 's3dc:local', 'ncalrpc: -U$USERNAME%$PASSWORD', 'over ncalrpc')
+plansmbtorture4testsuite('rpc.fsrvp', 's3dc:local', 'ncacn_np:$SERVER_IP[/pipe/FssagentRpc] -U$USERNAME%$PASSWORD', 'over ncacn_np')