This is an archive of the discontinued Mercurial Phabricator instance.

This patch didn't seem correct to me at first because str is a different type in Python 2 and 3. But if the desired result is to get a bytes, then the logic does seem to check out.

This revision is now accepted and ready to land.Feb 1 2018, 3:29 PM

Closed by commit rHG435547be7257: tests: get run-tests to reliably hand shellquote a string and not a bytes (authored by durin42). · Explain WhyFeb 1 2018, 3:32 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/run-tests.py (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4873		Jan 18 2018, 8:38 AM	★	★
Diff 2	5039		Feb 1 2018, 3:04 PM	★	★
Diff 3	5052	rHG435547be725724665208d62fb94bb20088aa1af3	Jan 17 2018, 7:11 PM	★	★

Status	Author	Revision
Closed	durin42	D1908 python3: whitelist an additional 23 passing tests
Closed	durin42	D1907 tests: fix a missed b prefix in a test extension in test-strip.t
Closed	durin42	D1906 revlog: correct type in check to verify rawtext is immutable
Closed	durin42	D1903 mq: use bytes() instead of str() to encode statusentries for writing
Closed	durin42	D1902 mq: open status file et al in bytes mode
Closed	durin42	D1901 mq: fix up statusentry to be both repr()-able and bytes()-able
Closed	durin42	D1900 python3: whitelist another 7 passing tests
Closed	durin42	D1899 localrepo: pass transaction kwargs as strings, not bytes
Closed	durin42	D1898 localrepo: consistently use native str when __dict__ is involved
Closed	durin42	D1897 smartset: use native string when peeking in __dict__
Closed	durin42	D1896 obsolete: use native string when peeking in __dict__
Closed	durin42	D1895 lsprof: use native string when peeking in __dict__
Closed	durin42	D1894 dirstate: use native strings when peeking in __dict__
Closed	durin42	D1893 context: use native string when peeking in __dict__
Closed	durin42	D1892 bundlerepo: use native str when peeking in __dict__
Closed	durin42	D1891 transaction: fix hg version check when loading journal
Closed	durin42	D1890 branchmap: make error messages consistent between Python 2 and 3
Closed	durin42	D1889 tests: bytestring-ify all the adhoc extensions in test-strip.t
Closed	durin42	D1888 filemerge: fix regular expression pattern to be bytes
Closed	durin42	D1887 tags: explicitly grab list of dict keys
Closed	durin42	D1886 commands: replace map() with list comprehension
Closed	durin42	D1885 commands: rewrite legacy ternary operator hack using modern syntax
Closed	durin42	D1884 strip: use %d for known-int string interpolation
Closed	durin42	D1905 strip: use in-place revset formatspec instead of %-formatting ourselves
Closed	durin42	D1883 tests: get run-tests to reliably hand shellquote a string and not a bytes

Diff 5052

tests/run-tests.py


	if self._debug:			if self._debug:
	script.append(b'set -x\n')			script.append(b'set -x\n')
	if self._hgcommand != b'hg':			if self._hgcommand != b'hg':
	script.append(b'alias hg="%s"\n' % self._hgcommand)			script.append(b'alias hg="%s"\n' % self._hgcommand)
	if os.getenv('MSYSTEM'):			if os.getenv('MSYSTEM'):
	script.append(b'alias pwd="pwd -W"\n')			script.append(b'alias pwd="pwd -W"\n')
	if self._case:			if self._case:
	script.append(b'TESTCASE=%s\n' % shellquote(self._case))			if isinstance(self._case, str):
				quoted = shellquote(self._case)
				else:
				quoted = shellquote(self._case.decode('utf8')).encode('utf8')
				script.append(b'TESTCASE=%s\n' % quoted)
	script.append(b'export TESTCASE\n')			script.append(b'export TESTCASE\n')

	n = 0			n = 0
	for n, l in enumerate(lines):			for n, l in enumerate(lines):
	if not l.endswith(b'\n'):			if not l.endswith(b'\n'):
	l += b'\n'			l += b'\n'
	if l.startswith(b'#require'):			if l.startswith(b'#require'):
	lsplit = l.split()			lsplit = l.split()

This is an archive of the discontinued Mercurial Phabricator instance.

tests: get run-tests to reliably hand shellquote a string and not a bytesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 5052

tests/run-tests.py

tests: get run-tests to reliably hand shellquote a string and not a bytes
ClosedPublic

Revision Contents
Changeset List