This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5667

tests: handle string escaping/encoding on Python 3
ClosedPublic

Authored by indygreg on Jan 23 2019, 8:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG13ccb03f2145: tests: handle string escaping/encoding on Python 3
Summary

This code was failing on Python 3 for a few reasons:

  1. sys.argv is str and str doesn't have a .decode()
  2. the "string_escape" encoding was renamed to "unicode_escape"

It is wonky casting to bytes to str to bytes. But this is test
code, so meh. I don't believe we exercise any code paths in these
tests where the arguments aren't ascii.

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

indygreg created this revision.Jan 23 2019, 8:58 PM
Closed by commit rHG13ccb03f2145: tests: handle string escaping/encoding on Python 3 (authored by indygreg). · Explain WhyJan 23 2019, 9:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-mq-missingfiles.t (6 lines)
Mtests/test-mq-qimport.t (6 lines)

Diff 13385

tests/test-mq-missingfiles.t

Issue835: qpush fails immediately when patching a missing file, but Issue835: qpush fails immediately when patching a missing file, but
remaining added files are still created empty which will trick a remaining added files are still created empty which will trick a
future qrefresh. future qrefresh.
$ cat > writelines.py <<EOF $ cat > writelines.py <<EOF
> import sys > import sys
> if sys.version_info[0] >= 3:
> encode = lambda x: x.encode('utf-8').decode('unicode_escape').encode('utf-8')
> else:
> encode = lambda x: x.decode('string_escape')
> path = sys.argv[1] > path = sys.argv[1]
> args = sys.argv[2:] > args = sys.argv[2:]
> assert (len(args) % 2) == 0 > assert (len(args) % 2) == 0
> >
> f = open(path, 'wb') > f = open(path, 'wb')
> for i in range(len(args) // 2): > for i in range(len(args) // 2):
> count, s = args[2*i:2*i+2] > count, s = args[2*i:2*i+2]
> count = int(count) > count = int(count)
> s = s.decode('string_escape') > s = encode(s)
> f.write(s*count) > f.write(s*count)
> f.close() > f.close()
> EOF > EOF
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH
$ hg init normal $ hg init normal

tests/test-mq-qimport.t

$ cat > writelines.py <<EOF $ cat > writelines.py <<EOF
> import sys > import sys
> if sys.version_info[0] >= 3:
> encode = lambda x: x.encode('utf-8').decode('unicode_escape').encode('utf-8')
> else:
> encode = lambda x: x.decode('string_escape')
> path = sys.argv[1] > path = sys.argv[1]
> args = sys.argv[2:] > args = sys.argv[2:]
> assert (len(args) % 2) == 0 > assert (len(args) % 2) == 0
> >
> f = open(path, 'wb') > f = open(path, 'wb')
> for i in range(len(args)//2): > for i in range(len(args)//2):
> count, s = args[2*i:2*i+2] > count, s = args[2*i:2*i+2]
> count = int(count) > count = int(count)
> s = s.decode('string_escape') > s = encode(s)
> f.write(s*count) > f.write(s*count)
> f.close() > f.close()
> >
> EOF > EOF
> cat <<EOF >> $HGRCPATH > cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq = > mq =
> [diff] > [diff]