mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

regrtest: fix --fromfile feature

Browse source 
* Update code for the name regrtest output format.
* Enhance also test_regrtest test on --fromfile
This commit is contained in:
Victor Stinner 2016-03-24 09:43:00 +01:00
parent 923590e397
commit 5de16e80c1
2 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/test/libregrtest/main.py
View file

@ -168,13 +168,21 @@ class Regrtest:
if self.ns.fromfile:
self.tests = []
# regex to match 'test_builtin' in line:
# '0:00:00 [ 4/400] test_builtin -- test_dict took 1 sec'
regex = (r'^(?:[0-9]+:[0-9]+:[0-9]+ *)?'
r'(?:\[[0-9/ ]+\] *)?'
r'(test_[a-zA-Z0-9_]+)')
regex = re.compile(regex)
with open(os.path.join(support.SAVEDCWD, self.ns.fromfile)) as fp:
count_pat = re.compile(r'\[\s*\d+/\s*\d+\]')
for line in fp:
line = count_pat.sub('', line)
guts = line.split() # assuming no test has whitespace in its name
if guts and not guts[0].startswith('#'):
self.tests.extend(guts)
line = line.strip()
if line.startswith('#'):
continue
match = regex.match(line)
if match is None:
continue
self.tests.append(match.group(1))
removepy(self.tests)
@ -194,7 +202,10 @@ class Regrtest:
else:
alltests = findtests(self.ns.testdir, stdtests, nottests)
self.selected = self.tests or self.ns.args or alltests
if not self.ns.fromfile:
self.selected = self.tests or self.ns.args or alltests
else:
self.selected = self.tests
if self.ns.single:
self.selected = self.selected[:1]
try: