mercurial: comparison tests/run-tests.py

equal deleted inserted replaced

-:16a5cb4eedb7
+:b96be0098624
 num_tests = [0]
 for test in self._tests:
 def get():
 num_tests[0] += 1
 if getattr(test, 'should_reload', False):
-return self._loadtest(test.path, num_tests[0])
+return self._loadtest(test, num_tests[0])
 return test
 if not os.path.exists(test.path):
 result.addSkip(test, "Doesn't exist")
 continue
 test = tests.pop(0)
 if self._loop:
 if getattr(test, 'should_reload', False):
 num_tests[0] += 1
 tests.append(
-self._loadtest(test.name, num_tests[0]))
+self._loadtest(test, num_tests[0]))
 else:
 tests.append(test)
 if self._jobs == 1:
 job(test, result)
 else:
 b'contrib-perf': 200,
 }
 perf = {}
 def sortkey(f):
 # run largest tests first, as they tend to take the longest
+f = f['path']
 try:
 return perf[f]
 except KeyError:
 try:
 val = -os.stat(f).st_size
 stdout, stderr = proc.communicate()
 args = stdout.strip(b'\0').split(b'\0')
 else:
 args = os.listdir(b'.')
-return [t for t in args
+return [{'path': t} for t in args
 if os.path.basename(t).startswith(b'test-')
 and (t.endswith(b'.py') or t.endswith(b'.t'))]
 def _runtests(self, tests):
+def _reloadtest(test, i):
+# convert a test back to its description dict
+desc = {'path': test.path}
+return self._gettest(desc, i)
 try:
 if self._installdir:
 self._installhg()
 self._checkhglib("Testing")
 else:
 self._installchg()
 if self.options.restart:
 orig = list(tests)
 while tests:
-if os.path.exists(tests[0] + ".err"):
+if os.path.exists(tests[0]['path'] + ".err"):
 break
 tests.pop(0)
 if not tests:
 print("running all tests")
 tests = orig
 retest=self.options.retest,
 keywords=kws,
 loop=self.options.loop,
 runs_per_test=self.options.runs_per_test,
 showchannels=self.options.showchannels,
-tests=tests, loadtest=self._gettest)
+tests=tests, loadtest=_reloadtest)
 verbosity = 1
 if self.options.verbose:
 verbosity = 2
 runner = TextTestRunner(self, verbosity=verbosity)
 result = runner.run(suite)
 """Obtain a Test by looking at its filename.
 Returns a Test instance. The Test may not be runnable if it doesn't
 map to a known type.
 """
-lctest = test.lower()
+path = test['path']
+lctest = path.lower()
 testcls = Test
 for ext, cls in self.TESTTYPES:
 if lctest.endswith(ext):
 testcls = cls
 break
-refpath = os.path.join(self._testdir, test)
+refpath = os.path.join(self._testdir, path)
 tmpdir = os.path.join(self._hgtmp, b'child%d' % count)
 t = testcls(refpath, tmpdir,
 keeptmpdir=self.options.keep_tmpdir,
 debug=self.options.debug,

changeset 32310	b96be0098624
parent 32303	dc131b9772f2
child 32311	a77a75a428f7