This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10310

tests: restore the ability to run `black` on Windows
ClosedPublic

Authored by mharbison72 on Apr 5 2021, 1:15 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG41d43d12c2c4: tests: restore the ability to run `black` on Windows
Summary

The hghave test for black silently stopped working with the change in
08fd76a553c9. This was the output of what it was hitting when run in the test
environment:

Traceback (most recent call last):\r (esc)
   File "c:\\users\\matt\\appdata\\local\\programs\\python\\python39\\lib\\runpy.py", line 197, in _run_module_as_main\r (esc)
     return _run_code(code, main_globals, None,\r (esc)
   File "c:\\users\\matt\\appdata\\local\\programs\\python\\python39\\lib\\runpy.py", line 87, in _run_code\r (esc)
     exec(code, run_globals)\r (esc)
   File "c:\\Users\\Matt\\AppData\\Roaming\\Python\\Python39\\Scripts\\black.exe\\__main__.py", line 4, in <module>\r (esc)
   File "C:\\Users\\Matt\\AppData\\Roaming\\Python\\Python39\\site-packages\\black\\__init__.py", line 70, in <module>\r (esc)
     CACHE_DIR = Path(user_cache_dir("black", version=__version__))\r (esc)
   File "C:\\Users\\Matt\\AppData\\Roaming\\Python\\Python39\\site-packages\\appdirs.py", line 293, in user_cache_dir\r (esc)
     path = os.path.normpath(_get_win_folder("CSIDL_LOCAL_APPDATA"))\r (esc)
   File "C:\\Users\\Matt\\AppData\\Roaming\\Python\\Python39\\site-packages\\appdirs.py", line 481, in _get_win_folder_with_pywin32\r (esc)
     dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)\r (esc)
 pywintypes.com_error: (-2147024893, '$ENOTDIR$.', None, None)\r (esc)
 [1]

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.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (15 lines)
Mtests/run-tests.py (1 line)
Mtests/test-check-format.t (6 lines)

Diff 26719

tests/hghave.py

if result['skipped'] or result['error']: if result['skipped'] or result['error']:
sys.exit(1) sys.exit(1)
def matchoutput(cmd, regexp, ignorestatus=False): def matchoutput(cmd, regexp, ignorestatus=False):
"""Return the match object if cmd executes successfully and its output """Return the match object if cmd executes successfully and its output
is matched by the supplied regular expression. is matched by the supplied regular expression.
""" """
# Tests on Windows have to fake USERPROFILE to point to the test area so
# that `~` is properly expanded on py3.8+. However, some tools like black
# make calls that need the real USERPROFILE in order to run `foo --version`.
env = os.environ
if os.name == 'nt':
env = os.environ.copy()
env['USERPROFILE'] = env['REALUSERPROFILE']
r = re.compile(regexp) r = re.compile(regexp)
p = subprocess.Popen( p = subprocess.Popen(
cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT cmd,
shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
env=env,
) )
s = p.communicate()[0] s = p.communicate()[0]
ret = p.returncode ret = p.returncode
return (ignorestatus or not ret) and r.search(s) return (ignorestatus or not ret) and r.search(s)
@check("baz", "GNU Arch baz client") @check("baz", "GNU Arch baz client")
def has_baz(): def has_baz():

tests/run-tests.py

env = os.environ.copy() env = os.environ.copy()
env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or '' env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or ''
env['HGEMITWARNINGS'] = '1' env['HGEMITWARNINGS'] = '1'
env['TESTTMP'] = _bytes2sys(self._testtmp) env['TESTTMP'] = _bytes2sys(self._testtmp)
env['TESTNAME'] = self.name env['TESTNAME'] = self.name
env['HOME'] = _bytes2sys(self._testtmp) env['HOME'] = _bytes2sys(self._testtmp)
if os.name == 'nt': if os.name == 'nt':
env['REALUSERPROFILE'] = env['USERPROFILE']
# py3.8+ ignores HOME: https://bugs.python.org/issue36264 # py3.8+ ignores HOME: https://bugs.python.org/issue36264
env['USERPROFILE'] = env['HOME'] env['USERPROFILE'] = env['HOME']
formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1]) formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1])
env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout
env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout) env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout)
# This number should match portneeded in _getport # This number should match portneeded in _getport
for port in xrange(3): for port in xrange(3):
# This list should be parallel to _portmap in _getreplacements # This list should be parallel to _portmap in _getreplacements

tests/test-check-format.t

#require black test-repo #require black test-repo
Black needs the real USERPROFILE in order to run on Windows
#if msys
$ USERPROFILE="$REALUSERPROFILE"
$ export USERPROFILE
#endif
$ cd $RUNTESTDIR/.. $ cd $RUNTESTDIR/..
$ black --check --diff `hg files 'set:(**.py + grep("^#!.*python")) - mercurial/thirdparty/**'` $ black --check --diff `hg files 'set:(**.py + grep("^#!.*python")) - mercurial/thirdparty/**'`