This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5199

test: fix self._testdir to use ues the right mercurial library during testing
ClosedPublic

Authored by sangeet259 on Oct 31 2018, 12:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG78e5b9d815fa: test: fix self._testdir to use the right mercurial library during testing
Summary

currently if you run tests from some other directory other than the ../tests/, you will get a warning stating

warning: Testing with unexpected mercurial lib: mercurial
         (expected /tmp/hgtests.xxxxxx/install/lib/python/mercurial)

This is because the the current directory being added to the 'PATH', if the self._testdir != runtestdir, owing to this line

if self._testdir != runtestdir:
    path = [self._testdir] + path

Also say you ran the tests from the hg base directory,
because directory is being added in the PATH(see the above snippet, at that stage the self._testdir has the value as cwd,
owing to a faulty initialisation). And since the current directory already has the 'hg', that is used in place of the hg that is
installed for the testing purposes in /tmp/hgtests.xxxxxx/...

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sangeet259 created this revision.Oct 31 2018, 12:32 PM
yuja added a subscriber: yuja.Nov 2 2018, 9:44 PM
  • a/tests/run-tests.py

+++ b/tests/run-tests.py
@@ -2527,13 +2527,14 @@

        os.umask(oldmask)
def _run(self, testdescs):

+ testdir = getcwdb()

self._testdir = osenvironb[b'TESTDIR'] = getcwdb()

Nit: maybe this line has to be removed.

    1. assume all tests in same folder for now if testdescs: pathname = os.path.dirname(testdescs[0]['path']) if pathname:
  • osenvironb[b'TESTDIR'] = os.path.join(osenvironb[b'TESTDIR'],
  • pathname)

+ testdir = os.path.join(testdir,pathname)
+ self._testdir = osenvironb[b'TESTDIR'] = testdir

The idea sounds good, but test-run-tests.t failed. Can you investigate?

sangeet259 edited the summary of this revision. (Show Details)Nov 3 2018, 3:23 PM
sangeet259 updated this revision to Diff 12389.
sangeet259 updated this revision to Diff 12390.Nov 3 2018, 3:27 PM
sangeet259 added a comment.Nov 3 2018, 3:52 PM

@yuja
This passes the tests now. I had missed the subsequent code that was dependent on the earlier initialisation of self._testdir.
Fixed it.

yuja added a comment.Nov 3 2018, 9:58 PM

Queued, thanks.

Closed by commit rHG78e5b9d815fa: test: fix self._testdir to use the right mercurial library during testing (authored by sangeet259). · Explain WhyNov 3 2018, 10:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (9 lines)

Diff 12392

tests/run-tests.py

statprof.stop() statprof.stop()
statprof.display() statprof.display()
return result return result
finally: finally:
os.umask(oldmask) os.umask(oldmask)
def _run(self, testdescs): def _run(self, testdescs):
testdir = getcwdb()
self._testdir = osenvironb[b'TESTDIR'] = getcwdb() self._testdir = osenvironb[b'TESTDIR'] = getcwdb()
# assume all tests in same folder for now # assume all tests in same folder for now
if testdescs: if testdescs:
pathname = os.path.dirname(testdescs[0]['path']) pathname = os.path.dirname(testdescs[0]['path'])
if pathname: if pathname:
osenvironb[b'TESTDIR'] = os.path.join(osenvironb[b'TESTDIR'], testdir = os.path.join(testdir, pathname)
pathname) self._testdir = osenvironb[b'TESTDIR'] = testdir
if self.options.outputdir: if self.options.outputdir:
self._outputdir = canonpath(_bytespath(self.options.outputdir)) self._outputdir = canonpath(_bytespath(self.options.outputdir))
else: else:
self._outputdir = self._testdir self._outputdir = getcwdb()
if testdescs and pathname: if testdescs and pathname:
self._outputdir = os.path.join(self._outputdir, pathname) self._outputdir = os.path.join(self._outputdir, pathname)
previoustimes = {} previoustimes = {}
if self.options.order_by_runtime: if self.options.order_by_runtime:
previoustimes = dict(loadtimes(self._outputdir)) previoustimes = dict(loadtimes(self._outputdir))
sorttests(testdescs, previoustimes, shuffle=self.options.random) sorttests(testdescs, previoustimes, shuffle=self.options.random)
if 'PYTHONHASHSEED' not in os.environ: if 'PYTHONHASHSEED' not in os.environ:
lctest = path.lower() lctest = path.lower()
testcls = Test testcls = Test
for ext, cls in self.TESTTYPES: for ext, cls in self.TESTTYPES:
if lctest.endswith(ext): if lctest.endswith(ext):
testcls = cls testcls = cls
break break
refpath = os.path.join(self._testdir, path) refpath = os.path.join(getcwdb(), path)
tmpdir = os.path.join(self._hgtmp, b'child%d' % count) tmpdir = os.path.join(self._hgtmp, b'child%d' % count)
# extra keyword parameters. 'case' is used by .t tests # extra keyword parameters. 'case' is used by .t tests
kwds = dict((k, testdesc[k]) for k in ['case'] if k in testdesc) kwds = dict((k, testdesc[k]) for k in ['case'] if k in testdesc)
t = testcls(refpath, self._outputdir, tmpdir, t = testcls(refpath, self._outputdir, tmpdir,
keeptmpdir=self.options.keep_tmpdir, keeptmpdir=self.options.keep_tmpdir,
debug=self.options.debug, debug=self.options.debug,