selftest: Always enable dns fakeing.

[obnox/samba/samba-obnox.git] / selftest / testlist.py

diff --git a/selftest/testlist.py b/selftest/testlist.py
index a68a9b8ab98cafcdb2098ca8dbaf1d8fabc6dbd7..34c7a5d31c953b6ec2424c8e3c4aeeafd7b61b6e 100644 (file)
--- a/selftest/testlist.py
+++ b/selftest/testlist.py
@@ -21,7 +21,9 @@
 
 __all__ = ['find_in_list', 'read_test_regexes', 'read_testlist']
 
+import os
 import re
+import sys
 
 def find_in_list(list, fullname):
     """Find test in list.
@@ -77,11 +79,14 @@ def read_testlist(inf, outf):
             return
         if l.startswith("-- TEST") and l.endswith(" --\n"):
             supports_loadlist = l.startswith("-- TEST-LOADLIST")
-            supports_idlist = l.startswith("-- TEST-IDLIST")
             name = inf.readline().rstrip("\n")
             env = inf.readline().rstrip("\n")
+            if supports_loadlist:
+                loadlist = inf.readline().rstrip("\n")
+            else:
+                loadlist = None
             cmdline = inf.readline().rstrip("\n")
-            yield (name, env, cmdline, supports_loadlist, supports_idlist)
+            yield (name, env, cmdline, loadlist)
         else:
             outf.write(l)
 
@@ -98,6 +103,14 @@ class RestrictedTestManager(object):
         self.test_list = test_list
         self.unused = set(self.test_list)
 
+    @classmethod
+    def from_path(cls, path):
+        f = open(path, 'r')
+        try:
+            return cls(read_restricted_test_list(f))
+        finally:
+            f.close()
+
     def should_run_testsuite(self, name):
         """Determine whether a testsuite should be run.
 
@@ -125,3 +138,34 @@ class RestrictedTestManager(object):
         :return: Iterator over test list entries that were not used.
         """
         return iter(self.unused)
+
+
+def open_file_or_pipe(path, mode):
+    """Open a file or pipe.
+
+    :param path: Path to open; if it ends with | it is assumed to be a
+        command to run
+    :param mode: Mode with which to open it
+    :return: File-like object
+    """
+    if path.endswith("|"):
+        return os.popen(path[:-1], mode)
+    return open(path, mode)
+
+
+def read_testlist_file(fn, outf=None):
+    """Read testlist file.
+
+    :param fn: Path to read (assumed to be a command to run if it ends with |)
+    :param outf: File-like object to pass non-test data through to
+        (defaults to stdout)
+    :return: Iterator over test suites (see read_testlist)
+    """
+    if outf is None:
+        outf = sys.stdout
+    inf = open_file_or_pipe(fn, 'r')
+    try:
+        for testsuite in read_testlist(inf, outf):
+            yield testsuite
+    finally:
+        inf.close()