s4:selftest: run the nbt tests before the smb tests

This hopefully avoids to run into problems with the
flakey error in the samba4.nbt.winsreplication test

 [1071/1154 in 58m58s] samba4.nbt.winsreplication(dc)
 Test if we always get back the same assoc_ctx
 Setup wrepl connections
 Test one pull replication cycle
 Setup wrepl connections
 Setup wrepl conflict pull connection
 UNEXPECTED(error): samba4.nbt.winsreplication.replica
 REASON: _StringException: _StringException: Unknown error/failure

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Sep 19 16:29:22 CEST 2011 on sn-devel-104

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index dd16bf3f06b8b1df0772e688044e7f6ae118446e..60e16a5d1684e6be3d99dfb1ce047fa4f75edf00 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -231,6 +231,10 @@ plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc", [smb4tortu
 
 plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, "$LISTOPT", 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'ntp.signd'])
 
+nbt_tests = smb4torture_testsuites("nbt.")
+for t in nbt_tests:
+    plansmbtorturetestsuite(t, "dc", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
+
 # Tests against the NTVFS POSIX backend
 ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"]
 
@@ -363,9 +367,6 @@ plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindi
 plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy'])
 plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "s4member",  [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy'])
 
-nbt_tests = smb4torture_testsuites("nbt.")
-for t in nbt_tests:
-    plansmbtorturetestsuite(t, "dc", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
 
 wb_opts = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=1\"", "--option=\"torture:winbindd_separator=/\"", "--option=\"torture:winbindd_netbios_name=$SERVER\"", "--option=\"torture:winbindd_netbios_domain=$DOMAIN\""]