mercurial: comparison tests/run-tests.py

equal deleted inserted replaced

-:aecac8059c00
+:3ece55d16044
 ('.t', TTest),
 ]
 def __init__(self):
 self.options = None
-self.testdir = None
+self._testdir = None
-self.hgtmp = None
+self._hgtmp = None
-self.inst = None
+self._installdir = None
-self.bindir = None
+self._bindir = None
-self.tmpbinddir = None
+self._tmpbinddir = None
-self.pythondir = None
+self._pythondir = None
-self.coveragefile = None
+self._coveragefile = None
 self._createdfiles = []
 self._hgpath = None
 def run(self, args, parser=None):
 """Run the test suite."""
 if kw in f:
 val *= 10
 return val
 tests.sort(key=sortkey)
-self.testdir = os.environ['TESTDIR'] = os.getcwd()
+self._testdir = os.environ['TESTDIR'] = os.getcwd()
 if 'PYTHONHASHSEED' not in os.environ:
 # use a random python hash seed all the time
 # we do the randomness ourself to know what seed is used
 os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
 if os.name == 'nt':
 # without this, we get the default temp dir location, but
 # in all lowercase, which causes troubles with paths (issue3490)
 d = os.getenv('TMP')
 tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
-self.hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)
+self._hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)
 if self.options.with_hg:
-self.inst = None
+self._installdir = None
-self.bindir = os.path.dirname(os.path.realpath(
+self._bindir = os.path.dirname(os.path.realpath(
 self.options.with_hg))
-self.tmpbindir = os.path.join(self.hgtmp, 'install', 'bin')
+self._tmpbindir = os.path.join(self._hgtmp, 'install', 'bin')
-os.makedirs(self.tmpbindir)
+os.makedirs(self._tmpbindir)
 # This looks redundant with how Python initializes sys.path from
 # the location of the script being executed.  Needed because the
 # "hg" specified by --with-hg is not the only Python script
 # executed in the test suite that needs to import 'mercurial'
 # ... which means it's not really redundant at all.
-self.pythondir = self.bindir
+self._pythondir = self._bindir
 else:
-self.inst = os.path.join(self.hgtmp, "install")
+self._installdir = os.path.join(self._hgtmp, "install")
-self.bindir = os.environ["BINDIR"] = os.path.join(self.inst,
+self._bindir = os.environ["BINDIR"] = \
-"bin")
+os.path.join(self._installdir, "bin")
-self.tmpbindir = self.bindir
+self._tmpbindir = self._bindir
-self.pythondir = os.path.join(self.inst, "lib", "python")
+self._pythondir = os.path.join(self._installdir, "lib", "python")
-os.environ["BINDIR"] = self.bindir
+os.environ["BINDIR"] = self._bindir
 os.environ["PYTHON"] = PYTHON
-path = [self.bindir] + os.environ["PATH"].split(os.pathsep)
+path = [self._bindir] + os.environ["PATH"].split(os.pathsep)
-if self.tmpbindir != self.bindir:
+if self._tmpbindir != self._bindir:
-path = [self.tmpbindir] + path
+path = [self._tmpbindir] + path
 os.environ["PATH"] = os.pathsep.join(path)
 # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
 # can run .../tests/run-tests.py test-foo where test-foo
 # adds an extension to HGRC. Also include run-test.py directory to
 # import modules like heredoctest.
-pypath = [self.pythondir, self.testdir,
+pypath = [self._pythondir, self._testdir,
 os.path.abspath(os.path.dirname(__file__))]
 # We have to augment PYTHONPATH, rather than simply replacing
 # it, in case external libraries are only available via current
 # PYTHONPATH.  (In particular, the Subversion bindings on OS X
 # are in /opt/subversion.)
 oldpypath = os.environ.get(IMPL_PATH)
 if oldpypath:
 pypath.append(oldpypath)
 os.environ[IMPL_PATH] = os.pathsep.join(pypath)
-self.coveragefile = os.path.join(self.testdir, '.coverage')
+self._coveragefile = os.path.join(self._testdir, '.coverage')
-vlog("# Using TESTDIR", self.testdir)
+vlog("# Using TESTDIR", self._testdir)
-vlog("# Using HGTMP", self.hgtmp)
+vlog("# Using HGTMP", self._hgtmp)
 vlog("# Using PATH", os.environ["PATH"])
 vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH])
 try:
 return self._runtests(tests) or 0
 if os.path.basename(t).startswith('test-')
 and (t.endswith('.py') or t.endswith('.t'))]
 def _runtests(self, tests):
 try:
-if self.inst:
+if self._installdir:
 self._installhg()
 self._checkhglib("Testing")
 else:
 self._usecorrectpython()
 tests = [self._gettest(t, i) for i, t in enumerate(tests)]
 failed = False
 warned = False
-suite = TestSuite(self.testdir,
+suite = TestSuite(self._testdir,
 jobs=self.options.jobs,
 whitelist=self.options.whitelisted,
 blacklist=self.options.blacklist,
 retest=self.options.retest,
 keywords=self.options.keywords,
 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, test)
-tmpdir = os.path.join(self.hgtmp, 'child%d' % count)
+tmpdir = os.path.join(self._hgtmp, 'child%d' % count)
 return testcls(refpath, tmpdir,
 keeptmpdir=self.options.keep_tmpdir,
 debug=self.options.debug,
 timeout=self.options.timeout,
 """Clean up state from this test invocation."""
 if self.options.keep_tmpdir:
 return
-vlog("# Cleaning up HGTMP", self.hgtmp)
+vlog("# Cleaning up HGTMP", self._hgtmp)
-shutil.rmtree(self.hgtmp, True)
+shutil.rmtree(self._hgtmp, True)
 for f in self._createdfiles:
 try:
 os.remove(f)
 except OSError:
 pass
 # 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'" %
 sys.executable)
-mypython = os.path.join(self.tmpbindir, pyexename)
+mypython = os.path.join(self._tmpbindir, pyexename)
 try:
 if os.readlink(mypython) == sys.executable:
 return
 os.unlink(mypython)
 except OSError, err:
 ' install --force --prefix="%(prefix)s"'
 ' --install-lib="%(libdir)s"'
 ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
 % {'exe': sys.executable, 'py3': py3, 'pure': pure,
 'compiler': compiler,
-'base': os.path.join(self.hgtmp, "build"),
+'base': os.path.join(self._hgtmp, "build"),
-'prefix': self.inst, 'libdir': self.pythondir,
+'prefix': self._installdir, 'libdir': self._pythondir,
-'bindir': self.bindir,
+'bindir': self._bindir,
 'nohome': nohome, 'logfile': installerrs})
 vlog("# Running", cmd)
 if os.system(cmd) == 0:
 if not self.options.verbose:
 os.remove(installerrs)
 f = open(installerrs)
 for line in f:
 print line,
 f.close()
 sys.exit(1)
-os.chdir(self.testdir)
+os.chdir(self._testdir)
 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')
+f = open(os.path.join(self._bindir, 'hg'), 'r')
 lines = [line.rstrip() for line in f]
 lines[0] += ' -3'
 f.close()
-f = open(os.path.join(self.bindir, 'hg'), 'w')
+f = open(os.path.join(self._bindir, 'hg'), 'w')
 for line in lines:
 f.write(line + '\n')
 f.close()
-hgbat = os.path.join(self.bindir, 'hg.bat')
+hgbat = os.path.join(self._bindir, 'hg.bat')
 if os.path.isfile(hgbat):
 # hg.bat expects to be put in bin/scripts while run-tests.py
 # installation layout put it in bin/ directly. Fix it
 f = open(hgbat, 'rb')
 data = f.read()
 f.close()
 else:
 print 'WARNING: cannot fix hg.bat reference to python.exe'
 if self.options.anycoverage:
-custom = os.path.join(self.testdir, 'sitecustomize.py')
+custom = os.path.join(self._testdir, 'sitecustomize.py')
-target = os.path.join(self.pythondir, 'sitecustomize.py')
+target = os.path.join(self._pythondir, 'sitecustomize.py')
 vlog('# Installing coverage trigger to %s' % target)
 shutil.copyfile(custom, target)
-rc = os.path.join(self.testdir, '.coveragerc')
+rc = os.path.join(self._testdir, '.coveragerc')
 vlog('# Installing coverage rc to %s' % rc)
 os.environ['COVERAGE_PROCESS_START'] = rc
-fn = os.path.join(self.inst, '..', '.coverage')
+fn = os.path.join(self._installdir, '..', '.coverage')
 os.environ['COVERAGE_FILE'] = fn
 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')
+expecthg = os.path.join(self._pythondir, 'mercurial')
 actualhg = self._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))
 return self._hgpath
 def _outputcoverage(self):
 vlog('# Producing coverage report')
-os.chdir(self.pythondir)
+os.chdir(self._pythondir)
 def covrun(*args):
 cmd = 'coverage %s' % ' '.join(args)
 vlog('# Running: %s' % cmd)
 os.system(cmd)
 covrun('-c')
 omit = ','.join(os.path.join(x, '*') for x in
-[self.bindir, self.testdir])
+[self._bindir, self._testdir])
 covrun('-i', '-r', '"--omit=%s"' % omit) # report
 if self.options.htmlcov:
-htmldir = os.path.join(self.testdir, 'htmlcov')
+htmldir = os.path.join(self._testdir, 'htmlcov')
 covrun('-i', '-b', '"--directory=%s"' % htmldir,
 '"--omit=%s"' % omit)
 if self.options.annotate:
-adir = os.path.join(self.testdir, 'annotated')
+adir = os.path.join(self._testdir, 'annotated')
 if not os.path.isdir(adir):
 os.mkdir(adir)
 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
 def _findprogram(self, program):

changeset 21534	3ece55d16044
parent 21533	aecac8059c00
child 21535	ab7e224bc089