selftest: Ensure the DC has started and and got a RID set before we proceed

[nivanova/samba-autobuild/.git] / selftest / filter-subunit

diff --git a/selftest/filter-subunit b/selftest/filter-subunit
index f5ab660350d107bbfbcc896e7ae6aaf53e1bd230..2ed1430b695b8b4366af99d9126ebeea04fcfb7a 100755 (executable)
--- a/selftest/filter-subunit
+++ b/selftest/filter-subunit
@@ -1,7 +1,22 @@
 #!/usr/bin/env python
 # Filter a subunit stream
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org>
-# Published under the GNU GPL, v3 or later
+# Copyright (C) 2009-2011 Jelmer Vernooij <jelmer@samba.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# NOTE: This script is a hack, meant as a placeholder until we can migrate
+# to upstream subunit's filtering tools.
 
 import optparse
 import os
@@ -17,19 +32,44 @@ parser = optparse.OptionParser("filter-subunit [options] < instream > outstream"
 parser.add_option("--expected-failures", type="string", 
        help="File containing list of regexes matching tests to consider known "
             "failures")
-parser.add_option("--strip-passed-output", action="store_true", 
+parser.add_option("--flapping", type="string",
+       help="File containing list of flapping tests, of which to ignore results.")
+parser.add_option("--strip-passed-output", action="store_true",
     help="Whether to strip output from tests that passed")
-
+parser.add_option("--fail-immediately", action="store_true",
+    help="Whether to stop on the first error", default=False)
 parser.add_option("--prefix", type="string",
        help="Add prefix to all test names")
-
+parser.add_option("--suffix", type="string",
+       help="Add suffix to all test names")
+parser.add_option("--fail-on-empty", default=False,
+       action="store_true", help="Fail if there was no subunit output")
+parser.add_option("--list", default=False,
+       action="store_true", help="Operate in list mode")
 opts, args = parser.parse_args()
 
+if opts.list:
+       prefix = opts.prefix
+       suffix = opts.suffix
+       if not prefix:
+               prefix = ""
+       if not suffix:
+               suffix = ""
+       for l in sys.stdin:
+               sys.stdout.write("%s%s%s\n" % (prefix, l.rstrip(), suffix))
+       sys.exit(0)
+
 if opts.expected_failures:
        expected_failures = subunithelper.read_test_regexes(opts.expected_failures)
 else:
        expected_failures = {}
 
+
+if opts.flapping:
+       flapping = subunithelper.read_test_regexes(opts.flapping)
+else:
+       flapping = {}
+
 statistics = {
        'TESTS_UNEXPECTED_OK': 0,
        'TESTS_EXPECTED_OK': 0,
@@ -44,7 +84,18 @@ def handle_sigint(sig, stack):
 signal.signal(signal.SIGINT, handle_sigint)
 
 out = subunithelper.SubunitOps(sys.stdout)
-msg_ops = subunithelper.FilterOps(out, opts.prefix, expected_failures,
-       opts.strip_passed_output)
+msg_ops = subunithelper.FilterOps(out, opts.prefix, opts.suffix, expected_failures,
+                                 opts.strip_passed_output,
+                                 fail_immediately=opts.fail_immediately,
+                                 flapping=flapping)
+
+try:
+       ret = subunithelper.parse_results(msg_ops, statistics, sys.stdin)
+except subunithelper.ImmediateFail:
+       sys.stdout.flush()
+       sys.exit(1)
 
-sys.exit(subunithelper.parse_results(msg_ops, statistics, sys.stdin))
+if opts.fail_on_empty and not msg_ops.seen_output:
+       sys.exit(1)
+else:
+       sys.exit(ret)