From c484f259c66ffcf0649dd5ab0d7c86e5c70d31af Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 4 Apr 2012 18:52:25 +1000 Subject: ldb: Detect failures in ldb.base again We need to wrap the ldb tests in the subunit blackbox helpers. We also needed to change to the right directory, or else the :< file:// syntax check does not work, as samba4.png is not found. Andrew Bartlett --- source4/selftest/tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/selftest/tests.py') diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index f08417454a..8279ba4041 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -92,8 +92,7 @@ for t in smb4torture_testsuites("ldap."): ldbdir = os.path.join(srcdir(), "lib/ldb") # Don't run LDB tests when using system ldb, as we won't have ldbtest installed if os.path.exists(os.path.join(samba4bindir, "ldbtest")): - plantestsuite("ldb.base", "none", "%s/tests/test-tdb.sh" % ldbdir, - allow_empty_output=True) + plantestsuite("ldb.base", "none", "%s/tests/test-tdb-subunit.sh %s" % (ldbdir, samba4bindir)) else: skiptestsuite("ldb.base", "Using system LDB, ldbtest not available") -- cgit