From 79b1a1092dbbb45bb8839c71e48479d1c6037b48 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 10 May 2011 22:14:34 +0200
Subject: selftest: Run tests for libsmbclient and libnetapi

This adds the known failure for the one test (netbios browsing) that
fails.

Andrew Bartlett
---
 source3/selftest/knownfail | 2 ++
 source3/selftest/tests.py  | 4 +++-
 source4/selftest/knownfail | 1 +
 source4/selftest/tests.py  | 6 +++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index b62ef3e667..4f746c8d70 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -12,3 +12,5 @@
 ^samba3.*rap.sam.*.useradd # Not provided by Samba 3
 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
 ^samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3
+^samba3.posix_s3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
+
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 262c564612..2a3002189c 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -192,7 +192,9 @@ unix = ["unix.info2", "unix.whoami"]
 
 nbt = ["nbt.dgram" ]
 
-tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt
+libsmbclient = ["libsmbclient"]
+
+tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt + libsmbclient
 
 sub = subprocess.Popen("%s --version 2> /dev/null" % smb4torture, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
 sub.communicate("")
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index af807fc3aa..266148b91f 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -86,3 +86,4 @@
 ^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
 #^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.*
 ^samba4.drs.fsmo.python
+^samba4.libsmbclient.opendir.opendir # This requires netbios browsing
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 9aeeec47af..bf42c7c303 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -230,7 +230,11 @@ smb2 = smb4torture_testsuites("smb2.")
 raw = filter(lambda x: "raw.qfileinfo.ipc" not in x, smb4torture_testsuites("raw."))
 base = smb4torture_testsuites("base.")
 
-for t in base + raw + smb2:
+netapi = smb4torture_testsuites("netapi.")
+
+libsmbclient = smb4torture_testsuites("libsmbclient.")
+
+for t in base + raw + smb2 + netapi + libsmbclient:
     plansmbtorturetestsuite(t, "dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD' + " " + " ".join(ntvfsargs))
 
 plansmbtorturetestsuite("raw.qfileinfo.ipc", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
-- 
cgit