This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2075

py3: add b'' prefixes to string literals in test files
ClosedPublic

Authored by pulkit on Feb 7 2018, 4:01 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa36d3c8a0e41: py3: add b'' prefixes to string literals in test files
Summary
  1. skip-blame because we are just adding b''

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

pulkit created this revision.Feb 7 2018, 4:01 AM
durin42 accepted this revision.Feb 7 2018, 6:15 AM
This revision is now accepted and ready to land.Feb 7 2018, 6:15 AM
Closed by commit rHGa36d3c8a0e41: py3: add b'' prefixes to string literals in test files (authored by pulkit). · Explain WhyFeb 7 2018, 6:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5289

tests/test-annotate.py

text) text)
# Basic usage # Basic usage
oldann = decorate(olddata, oldfctx) oldann = decorate(olddata, oldfctx)
p1ann = decorate(p1data, p1fctx) p1ann = decorate(p1data, p1fctx)
p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts) p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts)
self.assertEqual(p1ann[0], [ self.assertEqual(p1ann[0], [
annotateline('old', 1), annotateline(b'old', 1),
annotateline('old', 2), annotateline(b'old', 2),
annotateline('p1', 3), annotateline(b'p1', 3),
]) ])
p2ann = decorate(p2data, p2fctx) p2ann = decorate(p2data, p2fctx)
p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts) p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
self.assertEqual(p2ann[0], [ self.assertEqual(p2ann[0], [
annotateline('old', 1), annotateline(b'old', 1),
annotateline('p2', 2), annotateline(b'p2', 2),
annotateline('p2', 3), annotateline(b'p2', 3),
]) ])
# Test with multiple parents (note the difference caused by ordering) # Test with multiple parents (note the difference caused by ordering)
childann = decorate(childdata, childfctx) childann = decorate(childdata, childfctx)
childann = _annotatepair([p1ann, p2ann], childfctx, childann, False, childann = _annotatepair([p1ann, p2ann], childfctx, childann, False,
diffopts) diffopts)
self.assertEqual(childann[0], [ self.assertEqual(childann[0], [
annotateline('old', 1), annotateline(b'old', 1),
annotateline('c', 2), annotateline(b'c', 2),
annotateline('p2', 2), annotateline(b'p2', 2),
annotateline('c', 4), annotateline(b'c', 4),
annotateline('p2', 3), annotateline(b'p2', 3),
]) ])
childann = decorate(childdata, childfctx) childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, False, childann = _annotatepair([p2ann, p1ann], childfctx, childann, False,
diffopts) diffopts)
self.assertEqual(childann[0], [ self.assertEqual(childann[0], [
annotateline('old', 1), annotateline(b'old', 1),
annotateline('c', 2), annotateline(b'c', 2),
annotateline('p1', 3), annotateline(b'p1', 3),
annotateline('c', 4), annotateline(b'c', 4),
annotateline('p2', 3), annotateline(b'p2', 3),
]) ])
# Test with skipchild (note the difference caused by ordering) # Test with skipchild (note the difference caused by ordering)
childann = decorate(childdata, childfctx) childann = decorate(childdata, childfctx)
childann = _annotatepair([p1ann, p2ann], childfctx, childann, True, childann = _annotatepair([p1ann, p2ann], childfctx, childann, True,
diffopts) diffopts)
self.assertEqual(childann[0], [ self.assertEqual(childann[0], [
annotateline('old', 1), annotateline(b'old', 1),
annotateline('old', 2, True), annotateline(b'old', 2, True),
# note that this line was carried over from earlier so it is *not* # note that this line was carried over from earlier so it is *not*
# marked skipped # marked skipped
annotateline('p2', 2), annotateline(b'p2', 2),
annotateline('p2', 2, True), annotateline(b'p2', 2, True),
annotateline('p2', 3), annotateline(b'p2', 3),
]) ])
childann = decorate(childdata, childfctx) childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, True, childann = _annotatepair([p2ann, p1ann], childfctx, childann, True,
diffopts) diffopts)
self.assertEqual(childann[0], [ self.assertEqual(childann[0], [
annotateline('old', 1), annotateline(b'old', 1),
annotateline('old', 2, True), annotateline(b'old', 2, True),
annotateline('p1', 3), annotateline(b'p1', 3),
annotateline('p1', 3, True), annotateline(b'p1', 3, True),
annotateline('p2', 3), annotateline(b'p2', 3),
]) ])
if __name__ == '__main__': if __name__ == '__main__':
import silenttestrunner import silenttestrunner
silenttestrunner.main(__name__) silenttestrunner.main(__name__)

tests/test-arbitraryfilectx.t

Setup: Setup:
$ cat > eval.py <<EOF $ cat > eval.py <<EOF
> from __future__ import absolute_import > from __future__ import absolute_import
> import filecmp > import filecmp
> from mercurial import commands, context, registrar > from mercurial import commands, context, registrar
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command(b'eval', [], 'hg eval CMD') > @command(b'eval', [], 'hg eval CMD')
> def eval_(ui, repo, *cmds, **opts): > def eval_(ui, repo, *cmds, **opts):
> cmd = " ".join(cmds) > cmd = b" ".join(cmds)
> res = str(eval(cmd, globals(), locals())) > res = str(eval(cmd, globals(), locals()))
> ui.warn("%s" % res) > ui.warn(b"%s" % res)
> EOF > EOF
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "eval=`pwd`/eval.py" >> $HGRCPATH $ echo "eval=`pwd`/eval.py" >> $HGRCPATH
Arbitraryfilectx.cmp does not follow symlinks: Arbitraryfilectx.cmp does not follow symlinks:
$ mkdir case1 $ mkdir case1
$ cd case1 $ cd case1

tests/test-check-help.t

#require test-repo #require test-repo
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ cat <<'EOF' > scanhelptopics.py $ cat <<'EOF' > scanhelptopics.py
> from __future__ import absolute_import, print_function > from __future__ import absolute_import, print_function
> import re > import re
> import sys > import sys
> if sys.platform == "win32": > if sys.platform == "win32":
> import os, msvcrt > import os, msvcrt
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
> topics = set() > topics = set()
> topicre = re.compile(r':hg:`help ([a-z0-9\-.]+)`') > topicre = re.compile(br':hg:`help ([a-z0-9\-.]+)`')
> for fname in sys.argv: > for fname in sys.argv:
> with open(fname) as f: > with open(fname) as f:
> topics.update(m.group(1) for m in topicre.finditer(f.read())) > topics.update(m.group(1) for m in topicre.finditer(f.read()))
> for s in sorted(topics): > for s in sorted(topics):
> print(s) > print(s)
> EOF > EOF
$ cd "$TESTDIR"/.. $ cd "$TESTDIR"/..
Check if ":hg:`help TOPIC`" is valid: Check if ":hg:`help TOPIC`" is valid:
(use "xargs -n1 -t" to see which help commands are executed) (use "xargs -n1 -t" to see which help commands are executed)
$ testrepohg files 'glob:{hgdemandimport,hgext,mercurial}/**/*.py' \ $ testrepohg files 'glob:{hgdemandimport,hgext,mercurial}/**/*.py' \
> | sed 's|\\|/|g' \ > | sed 's|\\|/|g' \
> | xargs $PYTHON "$TESTTMP/scanhelptopics.py" \ > | xargs $PYTHON "$TESTTMP/scanhelptopics.py" \
> | xargs -n1 hg help > /dev/null > | xargs -n1 hg help > /dev/null

tests/test-conflict.t

>>>>>>> merge rev: test 1 >>>>>>> merge rev: test 1
Hop we are done. Hop we are done.
Verify line trimming of custom conflict marker using multi-byte characters Verify line trimming of custom conflict marker using multi-byte characters
$ hg up -q --clean . $ hg up -q --clean .
$ $PYTHON <<EOF $ $PYTHON <<EOF
> fp = open('logfile', 'w') > fp = open('logfile', 'w')
> fp.write('12345678901234567890123456789012345678901234567890' + > fp.write(b'12345678901234567890123456789012345678901234567890' +
> '1234567890') # there are 5 more columns for 80 columns > b'1234567890') # there are 5 more columns for 80 columns
> >
> # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
> fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
> >
> fp.close() > fp.close()
> EOF > EOF
$ hg add logfile $ hg add logfile
$ hg --encoding utf-8 commit --logfile logfile $ hg --encoding utf-8 commit --logfile logfile

tests/test-diff-binary-file.t

$ cd .. $ cd ..
Test text mode with extended git-style diff format Test text mode with extended git-style diff format
$ hg init b $ hg init b
$ cd b $ cd b
$ cat > writebin.py <<EOF $ cat > writebin.py <<EOF
> import sys > import sys
> path = sys.argv[1] > path = sys.argv[1]
> open(path, 'wb').write('\x00\x01\x02\x03') > open(path, 'wb').write(b'\x00\x01\x02\x03')
> EOF > EOF
$ $PYTHON writebin.py binfile.bin $ $PYTHON writebin.py binfile.bin
$ hg add binfile.bin $ hg add binfile.bin
$ hg ci -m 'add binfile.bin' $ hg ci -m 'add binfile.bin'
$ echo >> binfile.bin $ echo >> binfile.bin
$ hg ci -m 'change binfile.bin' $ hg ci -m 'change binfile.bin'