mercurial-scm/hg: comparison tests/run-tests.py

equal deleted inserted replaced

-:bfe2616a2b0e
+:d839e4820da7
 abort is a flag that turns to True if test execution should be aborted.
 It is consulted periodically during the execution of tests.
 """
-self._path = path
+self.path = path
 self.name = os.path.basename(path)
 self._testdir = os.path.dirname(path)
-self._errpath = os.path.join(self._testdir, '%s.err' % self.name)
+self.errpath = os.path.join(self._testdir, '%s.err' % self.name)
 self._options = options
 self._count = count
 self._threadtmp = tmpdir
 self._abort = abort
 except OSError, e:
 if e.errno != errno.EEXIST:
 raise
 self._testtmp = os.path.join(self._threadtmp,
-os.path.basename(self._path))
+os.path.basename(self.path))
 os.mkdir(self._testtmp)
 # Remove any previous output files.
-if os.path.exists(self._errpath):
+if os.path.exists(self.errpath):
-os.remove(self._errpath)
+os.remove(self.errpath)
 def run(self, result):
 result.startTest(self)
 interrupted = False
 try:
 def runTest(self):
 """Run this test instance.
 This will return a tuple describing the result of the test.
 """
-if not os.path.exists(self._path):
-raise SkipTest("Doesn't exist")
 options = self._options
-if not (options.whitelisted and self.name in options.whitelisted):
-if options.blacklist and self.name in options.blacklist:
-raise SkipTest('blacklisted')
-if options.retest and not os.path.exists('%s.err' % self.name):
-raise IgnoreTest('not retesting')
-if options.keywords:
-f = open(self.name)
-t = f.read().lower() + self.name.lower()
-f.close()
-for k in options.keywords.lower().split():
-if k in t:
-break
-else:
-raise IgnoreTest("doesn't match keyword")
-if not os.path.basename(self.name.lower()).startswith('test-'):
-raise SkipTest('not a test file')
 replacements, port = self._getreplacements()
 env = self._getenv(port)
 self._daemonpids.append(env['DAEMON_PIDS'])
 self._createhgrc(env['HGRCPATH'])
 info = {}
 if not options.nodiff:
 iolock.acquire()
 if options.view:
 os.system("%s %s %s" % (options.view, self._refpath,
-self._errpath))
+self.errpath))
 else:
 info = showdiff(self._refout, out, self._refpath,
-self._errpath)
+self.errpath)
 iolock.release()
 msg = ''
 if info.get('servefail'):
 msg += 'serve failed and '
 if ret:
 else:
 msg += 'output changed'
 if (ret != 0 or out != self._refout) and not self._skipped \
 and not options.debug:
-f = open(self._errpath, 'wb')
+f = open(self.errpath, 'wb')
 for line in out:
 f.write(line)
 f.close()
 self.fail(msg, ret)
 shutil.rmtree(self._testtmp, True)
 shutil.rmtree(self._threadtmp, True)
 if (self._ret != 0 or self._out != self._refout) and not self._skipped \
 and not self._options.debug and self._out:
-f = open(self._errpath, 'wb')
+f = open(self.errpath, 'wb')
 for line in self._out:
 f.write(line)
 f.close()
 vlog("# Ret was:", self._ret)
 warned = ret is False
 if not self._options.nodiff:
 log("\n%s: %s %s" % (warned and 'Warning' or 'ERROR', self.name,
 msg))
 if (not ret and self._options.interactive and
-os.path.exists(self._errpath)):
+os.path.exists(self.errpath)):
 iolock.acquire()
 print 'Accept this change? [n] ',
 answer = sys.stdin.readline().strip()
 iolock.release()
 if answer.lower() in ('y', 'yes'):
 if self.name.endswith('.t'):
-rename(self._errpath, self._path)
+rename(self.errpath, self.path)
 else:
-rename(self._errpath, '%s.out' % self._path)
+rename(self.errpath, '%s.out' % self.path)
 return '.', self.name, ''
 if warned:
 raise WarnTest(msg)
 def _refpath(self):
 return os.path.join(self._testdir, '%s.out' % self.name)
 def _run(self, replacements, env):
 py3kswitch = self._options.py3k_warnings and ' -3' or ''
-cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self._path)
+cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self.path)
 vlog("# Running", cmd)
 if os.name == 'nt':
 replacements.append((r'\r\n', '\n'))
 return run(cmd, self._testtmp, replacements, env, self._abort,
 debug=self._options.debug, timeout=self._options.timeout)
 @property
 def _refpath(self):
 return os.path.join(self._testdir, self.name)
 def _run(self, replacements, env):
-f = open(self._path)
+f = open(self.path)
 lines = f.readlines()
 f.close()
 salt, script, after, expected = self._parsetest(lines)
 super(TestSuite, self).__init__(*args, **kwargs)
 self._runner = runner
 def run(self, result):
-# We modify the list, so copy so callers aren't confused.
+options = self._runner.options
-tests = list(self._tests)
+# We have a number of filters that need to be applied. We do this
+# here instead of inside Test because it makes the running logic for
+# Test simpler.
+tests = []
+for test in self._tests:
+if not os.path.exists(test.path):
+result.addSkip(test, "Doesn't exist")
+continue
+if not (options.whitelisted and test.name in options.whitelisted):
+if options.blacklist and test.name in options.blacklist:
+result.addSkip(test, 'blacklisted')
+continue
+if options.retest and not os.path.exists(test.errpath):
+result.addIgnore(test, 'not retesting')
+continue
+if options.keywords:
+f = open(test.path)
+t = f.read().lower() + test.name.lower()
+f.close()
+ignored = False
+for k in options.keywords.lower().split():
+if k not in t:
+result.addIgnore(test, "doesn't match keyword")
+ignored = True
+break
+if ignored:
+continue
+if not test.name.lower().startswith('test-'):
+result.addSkip(test, 'not a test file')
+continue
+tests.append(test)
 jobs = self._runner.options.jobs
 done = queue.Queue()
 running = 0

changeset 21507	d839e4820da7
parent 21506	bfe2616a2b0e
child 21508	4cc3aaa3a2ee