Fix the build, add filtered subunit runner.

diff --git a/.gitignore b/.gitignore
index b40c794169589e814af65d77ad48ed30de227d43..7f1a9be05790e506110506c5d5b0706b802078da 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -412,3 +412,4 @@ docs-xml/Samba3-HOWTO/images/idmap-uid2sid.png
 docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png
 docs-xml/Samba3-HOWTO/images/pdftosocket.png
 docs-xml/Samba3-HOWTO/images/trusts1.png
 docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png
 docs-xml/Samba3-HOWTO/images/pdftosocket.png
 docs-xml/Samba3-HOWTO/images/trusts1.png

+source4/.testrepository

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index c3446146a7a3d4a3597eb2d1e5ac2b69e92b9dcc..9cc224b562e79d174c1ca5a27eda699441e27187 100644 (file)
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -204,7 +204,7 @@ class Ldb(ldb.Ldb):
             try:
                 self.delete(attr)
             except ldb.LdbError, (errno, _):
             try:
                 self.delete(attr)
             except ldb.LdbError, (errno, _):

-                if errno != ldb.ERR_NO_SUCH_OBJECT
+                if errno != ldb.ERR_NO_SUCH_OBJECT:

                     # Ignore missing dn errors
                     raise
 
                     # Ignore missing dn errors
                     raise
 

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 9e2896e26d38fd7c9bac7ea9be64d3b159737ca9..04d42d279c9884deb8c8c245ac54f95db945d01e 100644 (file)
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -23,6 +23,10 @@ test-subunit:: everything
        $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
        $(ST_DONE_TEST)
 
        $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
        $(ST_DONE_TEST)
 

+test-subunit-filtered:: everything
+       $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL)
+       $(ST_DONE_TEST)
+

 slowtest:: everything
        $(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
        $(ST_DONE_TEST)
 slowtest:: everything
        $(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
        $(ST_DONE_TEST)