This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11035

run-tests: enforce the drive letter from `getcwd` to upper case
ClosedPublic

Authored by marmoute on Jul 9 2021, 7:48 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf0fbe8f4faa6: run-tests: enforce the drive letter from `getcwd` to upper case
Summary

For some reason os.getcwd() can return either c: or C: depending of which
binary you used on Windows. We normalize this to C: and the like. This fix
test-run-tests.t on windows as the drive letter in "$TESTTMP" was "wrongly"
set to 'c:/' if the test path wasn't explicitly specified.

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

marmoute created this revision.Jul 9 2021, 7:48 AM
mharbison72 added a subscriber: mharbison72.Jul 9 2021, 1:02 PM

Does the issue happen with 3.7? I'm wondering if this is the normalization they started to do in os.path.realpath(). See 3dfebba99ef6

marmoute added a comment.Jul 9 2021, 1:12 PM

The same getcwd is called in both case, so, I don't know. I don't have interactive testing on Windows. Can you check ?

(in the mean time, this change does not seems bad in itself, just hacky)

marmoute planned changes to this revision.Jul 9 2021, 7:16 PM

I eventually got to th ebottom of it. os.getcwd return inconsistent capitalization for the drive letter. So any os.path.join is getting poisoned. Unless the path joined is already absolute and it trumps the os.getcwd one.

So I am adjusting the function to return something proper. Update coming.

marmoute edited parent revisions, added: D11041: run-tests: use a global WINDOWS constant instead of multiple tests; removed: D11034: test-run-test: use explicit variables to clarify paths.Jul 9 2021, 8:34 PM
marmoute retitled this revision from run-test: adjust the drive letter to upper case for TESTDIR to run-tests: enforce the drive letter from `getcwd` to upper case.
marmoute edited the summary of this revision. (Show Details)
marmoute added a child revision: D11042: hg-ssh: normalize the drive of the current working directory on windows.
marmoute updated this revision to Diff 29055.
baymax updated this revision to Diff 29076.Jul 9 2021, 9:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29096.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute edited the summary of this revision. (Show Details)Jul 10 2021, 1:44 PM
marmoute updated this revision to Diff 29114.
Alphare accepted this revision.Jul 13 2021, 11:21 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:21 AM
marmoute updated this revision to Diff 29232.Jul 13 2021, 2:28 PM

Revision Contents
Changeset List

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

Diff 29302

tests/run-tests.py

# help keep code consistent between platforms. # help keep code consistent between platforms.
def _sys2bytes(p): def _sys2bytes(p):
return p return p
_bytes2sys = _sys2bytes _bytes2sys = _sys2bytes
osenvironb = os.environ osenvironb = os.environ
getcwdb = os.getcwd getcwdb = os.getcwd
if WINDOWS:
_getcwdb = getcwdb
def getcwdb():
cwd = _getcwdb()
if re.match(b'^[a-z]:', cwd):
# os.getcwd() is inconsistent on the capitalization of the drive
# letter, so adjust it. see https://bugs.python.org/issue40368
cwd = cwd[0:1].upper() + cwd[1:]
return cwd
# For Windows support # For Windows support
wifexited = getattr(os, "WIFEXITED", lambda x: False) wifexited = getattr(os, "WIFEXITED", lambda x: False)
# Whether to use IPv6 # Whether to use IPv6
def checksocketfamily(name, port=20058): def checksocketfamily(name, port=20058):
"""return true if we can listen on localhost using family=name """return true if we can listen on localhost using family=name
name should be either 'AF_INET', or 'AF_INET6'. name should be either 'AF_INET', or 'AF_INET6'.
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() 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:
testdir = os.path.join(testdir, pathname) testdir = os.path.join(testdir, pathname)
self._testdir = osenvironb[b'TESTDIR'] = testdir self._testdir = osenvironb[b'TESTDIR'] = testdir
if self.options.outputdir: if self.options.outputdir:
self._outputdir = canonpath(_sys2bytes(self.options.outputdir)) self._outputdir = canonpath(_sys2bytes(self.options.outputdir))