This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5240

tests: fix up some import statements caught by Python 3
ClosedPublic

Authored by durin42 on Nov 7 2018, 2:21 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG71b8ad0ef3e0: tests: fix up some import statements caught by Python 3
Summary

I'm curious how the import checker manages to be so much more
pedantic in Python 3, but not enough to bother exploring.

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

durin42 created this revision.Nov 7 2018, 2:21 PM
martinvonz accepted this revision.Nov 7 2018, 2:53 PM
This revision is now accepted and ready to land.Nov 7 2018, 2:53 PM
Closed by commit rHG71b8ad0ef3e0: tests: fix up some import statements caught by Python 3 (authored by durin42). · Explain WhyNov 7 2018, 2:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12472

tests/test-remotefilelog-bundle2-legacy.t

$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ . "$TESTDIR/remotefilelog-library.sh" $ . "$TESTDIR/remotefilelog-library.sh"
generaldelta to generaldelta interactions with bundle2 but legacy clients generaldelta to generaldelta interactions with bundle2 but legacy clients
without changegroup2 support without changegroup2 support
$ cat > testcg2.py << EOF $ cat > testcg2.py << EOF
> from mercurial import changegroup, registrar, util
> import sys > import sys
> from mercurial import changegroup, registrar, util
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command('testcg2', norepo=True) > @command('testcg2', norepo=True)
> def testcg2(ui): > def testcg2(ui):
> if not util.safehasattr(changegroup, 'cg2packer'): > if not util.safehasattr(changegroup, 'cg2packer'):
> sys.exit(80) > sys.exit(80)
> EOF > EOF
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> testcg2 = $TESTTMP/testcg2.py > testcg2 = $TESTTMP/testcg2.py
> EOF > EOF
$ hg testcg2 || exit 80 $ hg testcg2 || exit 80
$ cat > disablecg2.py << EOF $ cat > disablecg2.py << EOF
> from mercurial import changegroup, util, error > from mercurial import changegroup, error, util
> deleted = False > deleted = False
> def reposetup(ui, repo): > def reposetup(ui, repo):
> global deleted > global deleted
> if deleted: > if deleted:
> return > return
> packermap = changegroup._packermap > packermap = changegroup._packermap
> # protect against future changes > # protect against future changes
> if len(packermap) != 3: > if len(packermap) != 3:

tests/test-remotefilelog-cacheprocess.t

> EOF > EOF
$ echo x > x $ echo x > x
$ echo y > y $ echo y > y
$ echo z > z $ echo z > z
$ hg commit -qAm xy $ hg commit -qAm xy
$ cd .. $ cd ..
$ cat > cacheprocess-logger.py <<EOF $ cat > cacheprocess-logger.py <<EOF
> import sys, os, shutil > import os
> import shutil
> import sys
> f = open('$TESTTMP/cachelog.log', 'w') > f = open('$TESTTMP/cachelog.log', 'w')
> srccache = os.path.join('$TESTTMP', 'oldhgcache') > srccache = os.path.join('$TESTTMP', 'oldhgcache')
> def log(message): > def log(message):
> f.write(message) > f.write(message)
> f.flush() > f.flush()
> destcache = sys.argv[-1] > destcache = sys.argv[-1]
> try: > try:
> while True: > while True: