summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-03-01 16:24:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-03-01 16:24:59 +0100
commit24d52dc362210328e16545830835361ac82432c4 (patch)
tree77f0e8ae8425e7065392a7513576be1b70661ca1
parent4e4e341c68473d92516a3e3c612153a792017bb9 (diff)
downloadsamba-24d52dc362210328e16545830835361ac82432c4.tar.gz
samba-24d52dc362210328e16545830835361ac82432c4.tar.bz2
samba-24d52dc362210328e16545830835361ac82432c4.zip
Fix the build, add filtered subunit runner.
-rw-r--r--.gitignore1
-rw-r--r--source4/scripting/python/samba/__init__.py2
-rw-r--r--source4/selftest/config.mk4
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b40c794169..7f1a9be057 100644
--- 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
+source4/.testrepository
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index c3446146a7..9cc224b562 100644
--- 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, _):
- if errno != ldb.ERR_NO_SUCH_OBJECT
+ if errno != ldb.ERR_NO_SUCH_OBJECT:
# Ignore missing dn errors
raise
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 9e2896e26d..04d42d279c 100644
--- 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)
+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)