tests/run-tests.py
changeset 881 cd432ceb6544
parent 880 0b9f0c42b566
child 882 c3681742c0c7
equal deleted inserted replaced
879:0738a9d72c57 881:cd432ceb6544
   229             for line in f.readlines():
   229             for line in f.readlines():
   230                 line = line.strip()
   230                 line = line.strip()
   231                 if line and not line.startswith('#'):
   231                 if line and not line.startswith('#'):
   232                     blacklist[line] = filename
   232                     blacklist[line] = filename
   233 
   233 
       
   234             f.close()
       
   235 
   234         options.blacklist = blacklist
   236         options.blacklist = blacklist
   235 
   237 
   236     return (options, args)
   238     return (options, args)
   237 
   239 
   238 def rename(src, dst):
   240 def rename(src, dst):
   488             # queue up a list of expected results
   490             # queue up a list of expected results
   489             expected.setdefault(pos, []).append(l[2:])
   491             expected.setdefault(pos, []).append(l[2:])
   490         else:
   492         else:
   491             # non-command/result - queue up for merged output
   493             # non-command/result - queue up for merged output
   492             after.setdefault(pos, []).append(l)
   494             after.setdefault(pos, []).append(l)
       
   495 
       
   496     t.close()
   493 
   497 
   494     script.append('echo %s %s $?\n' % (salt, n + 1))
   498     script.append('echo %s %s $?\n' % (salt, n + 1))
   495 
   499 
   496     fd, name = tempfile.mkstemp(suffix='hg-tst')
   500     fd, name = tempfile.mkstemp(suffix='hg-tst')
   497 
   501 
   925             if options.retest and not os.path.exists(test + ".err"):
   929             if options.retest and not os.path.exists(test + ".err"):
   926                 skipped += 1
   930                 skipped += 1
   927                 continue
   931                 continue
   928 
   932 
   929             if options.keywords:
   933             if options.keywords:
   930                 t = open(test).read().lower() + test.lower()
   934                 fp = open(test)
       
   935                 t = fp.read().lower() + test.lower()
       
   936                 fp.close()
   931                 for k in options.keywords.lower().split():
   937                 for k in options.keywords.lower().split():
   932                     if k in t:
   938                     if k in t:
   933                         break
   939                         break
   934                 else:
   940                 else:
   935                     skipped += 1
   941                     skipped += 1