From 53a147d1c0c54fe94ac21f25088fd874d1300102 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 5 Mar 2012 04:05:35 +0100 Subject: selftest.run: Factor out read_testlist_file and open_file_or_pipe. Autobuild-User: Jelmer Vernooij Autobuild-Date: Mon Mar 5 05:42:19 CET 2012 on sn-devel-104 --- selftest/selftest.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'selftest/selftest.py') diff --git a/selftest/selftest.py b/selftest/selftest.py index 9ca1e45c1d..26c409af45 100755 --- a/selftest/selftest.py +++ b/selftest/selftest.py @@ -344,25 +344,16 @@ else: os.environ["SELFTEST_MAXTIME"] = str(torture_maxtime) -def open_file_or_pipe(path, mode): - if path.endswith("|"): - return os.popen(path[:-1], mode) - return open(path, mode) - available = [] for fn in opts.testlist: - inf = open_file_or_pipe(fn, 'r') - try: - for testsuite in testlist.read_testlist(inf, sys.stdout): - if not testlist.should_run_test(tests, testsuite): - continue - name = testsuite[0] - if (includes is not None and - testlist.find_in_list(includes, name) is not None): - continue - available.append(testsuite) - finally: - inf.close() + for testsuite in testlist.read_testlist_file(fn): + if not testlist.should_run_test(tests, testsuite): + continue + name = testsuite[0] + if (includes is not None and + testlist.find_in_list(includes, name) is not None): + continue + available.append(testsuite) if opts.load_list: restricted_mgr = testlist.RestrictedTestManager.from_path(opts.load_list) -- cgit