From 70dc528fe5e07934a94fcce90c4d6b733e9c2b09 Mon Sep 17 00:00:00 2001
From: Eugine Blikh <bigbes@gmail.com>
Date: Fri, 30 Aug 2013 11:44:43 +0400
Subject: [PATCH] Fix for multiple similar patterns in unittest.find_tests
---
test/lib/unittest_server.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/lib/unittest_server.py b/test/lib/unittest_server.py
index de9cd16907..9091510481 100644
--- a/test/lib/unittest_server.py
+++ b/test/lib/unittest_server.py
@@ -35,12 +35,12 @@ class UnittestServer(Server):
self.builddir = builddir
def find_tests(self, test_suite, suite_path):
- def patterned(name):
- for i in test_suite.args.tests:
- if name.find(i) != -1:
- return True
- return False
- for f in sorted(glob.glob(os.path.join(suite_path, '*.test'))):
- if os.access(f, os.X_OK) and os.path.isfile(f) and patterned(f):
- test_suite.tests.append(UnitTest(f, test_suite.args,
- test_suite.ini));
+ def patterned(test, patterns):
+ answer = []
+ for i in patterns:
+ if test.name.find(i) != -1:
+ answer.append(test)
+ return answer
+
+ test_suite.tests = [UnitTest(k, test_suite.args, test_suite.ini) for k in sorted(glob.glob(os.path.join(suite_path, "*.test" )))]
+ test_suite.tests = sum(map((lambda x: patterned(x, test_suite.args.tests)), test_suite.tests), [])
--
GitLab