mercurial: comparison tests/run-tests.py

equal deleted inserted replaced

-:71081f7f9e52
+:f7ac3c63d844
 and (t.endswith('.py') or t.endswith('.t'))]
 def _runtests(self, tests):
 try:
 if self.inst:
-self.installhg()
+self._installhg()
-self.checkhglib("Testing")
+self._checkhglib("Testing")
 else:
-self.usecorrectpython()
+self._usecorrectpython()
 if self.options.restart:
 orig = list(tests)
 while tests:
 if os.path.exists(tests[0] + ".err"):
 print "Skipped %s: %s" % s
 for s in self.results['~']:
 print "Warned %s: %s" % s
 for s in self.results['!']:
 print "Failed %s: %s" % s
-self.checkhglib("Tested")
+self._checkhglib("Tested")
 print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
 tested, skipped + ignored, warned, failed)
 if self.results['!']:
 print 'python hash seed:', os.environ['PYTHONHASHSEED']
 if self.options.time:
-self.outputtimes()
+self._outputtimes()
 if self.options.anycoverage:
-self.outputcoverage()
+self._outputcoverage()
 except KeyboardInterrupt:
 failed = True
 print "\ninterrupted!"
 if failed:
 return 1
 if warned:
 return 80
-def gettest(self, test, count):
+def _gettest(self, test, count):
 """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.
 """
 try:
 os.remove(f)
 except OSError:
 pass
-def usecorrectpython(self):
+def _usecorrectpython(self):
 # Some tests run the Python interpreter. They must use the
 # same interpreter or bad things will happen.
 pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
 if getattr(os, 'symlink', None):
 vlog("# Making python executable in test path a symlink to '%s'" %
 path.remove(exedir)
 os.environ['PATH'] = os.pathsep.join([exedir] + path)
 if not self._findprogram(pyexename):
 print "WARNING: Cannot find %s in search path" % pyexename
-def installhg(self):
+def _installhg(self):
 vlog("# Performing temporary installation of HG")
 installerrs = os.path.join("tests", "install.err")
 compiler = ''
 if self.options.compiler:
 compiler = '--compiler ' + self.options.compiler
 print line,
 f.close()
 sys.exit(1)
 os.chdir(self.testdir)
-self.usecorrectpython()
+self._usecorrectpython()
 if self.options.py3k_warnings and not self.options.anycoverage:
 vlog("# Updating hg command to enable Py3k Warnings switch")
 f = open(os.path.join(self.bindir, 'hg'), 'r')
 lines = [line.rstrip() for line in f]
 vlog('# Installing coverage rc to %s' % rc)
 os.environ['COVERAGE_PROCESS_START'] = rc
 fn = os.path.join(self.inst, '..', '.coverage')
 os.environ['COVERAGE_FILE'] = fn
-def checkhglib(self, verb):
+def _checkhglib(self, verb):
 """Ensure that the 'mercurial' package imported by python is
 the one we expect it to be.  If not, print a warning to stderr."""
 expecthg = os.path.join(self.pythondir, 'mercurial')
 actualhg = _gethgpath()
 if os.path.abspath(actualhg) != os.path.abspath(expecthg):
 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
 '         (expected %s)\n'
 % (verb, actualhg, expecthg))
-def outputtimes(self):
+def _outputtimes(self):
 vlog('# Producing time report')
 self.times.sort(key=lambda t: (t[1], t[0]), reverse=True)
 cols = '%7.3f   %s'
 print '\n%-7s   %s' % ('Time', 'Test')
 for test, timetaken in self.times:
 print cols % (timetaken, test)
-def outputcoverage(self):
+def _outputcoverage(self):
 vlog('# Producing coverage report')
 os.chdir(self.pythondir)
 def covrun(*args):
 cmd = 'coverage %s' % ' '.join(args)
 running = 0
 count = 0
 def job(test, count):
 try:
-t = self.gettest(test, count)
+t = self._gettest(test, count)
 done.put(t.run())
 t.cleanup()
 except KeyboardInterrupt:
 pass
 except: # re-raises

changeset 21378	f7ac3c63d844
parent 21377	71081f7f9e52
child 21379	ab1a95270a50