waf-pidl: don't need this debug ls any more
[samba.git] / selftest / filter-subunit
index 41d92c97e89ad54e25202daceaaf32324f96f612..923d5cf3a30053c14b14e0cec418676a087db27f 100755 (executable)
@@ -5,13 +5,14 @@
 
 import optparse
 import os
-import subunithelper
 import sys
 import signal
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python"))
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools"))
 
+import subunithelper
+
 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 "
@@ -25,9 +26,9 @@ parser.add_option("--prefix", type="string",
 opts, args = parser.parse_args()
 
 if opts.expected_failures:
-       expected_failures = list(subunithelper.read_test_regexes(opts.expected_failures))
+       expected_failures = subunithelper.read_test_regexes(opts.expected_failures)
 else:
-       expected_failures = []
+       expected_failures = {}
 
 statistics = {
        'TESTS_UNEXPECTED_OK': 0,