This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2580

tests: fix various test-check-module-imports.t violations
ClosedPublic

Authored by durin42 on Mar 3 2018, 9:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7bc33d677c0c: tests: fix various test-check-module-imports.t violations
Summary

Somehow these are only caught when running the test under Python 3.

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.Mar 3 2018, 9:37 AM
pulkit added a subscriber: pulkit.Mar 3 2018, 10:52 AM
pulkit added inline comments.
tests/test-i18n.t
58–59

I am not sure why we need this but according to rest of the patch, these couple of imports should be in new lines.

durin42 added inline comments.Mar 3 2018, 1:02 PM
tests/test-i18n.t
58–59

The linter doesn't enforce that, so I didn't bother. Two imports felt short enough as to not explode it out into multiple lines.

The import checker does require that importing encoding or registrar has to come after importing _ from i18n.

pulkit accepted this revision.Mar 3 2018, 1:09 PM
Closed by commit rHG7bc33d677c0c: tests: fix various test-check-module-imports.t violations (authored by durin42). · Explain WhyMar 3 2018, 2:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-i18n.t (2 lines)
Mtests/test-lfs.t (2 lines)
Mtests/test-resolve.t (7 lines)
Mtests/test-rollback.t (2 lines)
Mtests/test-split.t (3 lines)

Diff 6452

tests/test-i18n.t

$ $PYTHON check-translation.py --doctest $ $PYTHON check-translation.py --doctest
$ cd $TESTTMP $ cd $TESTTMP
#if gettext #if gettext
Check i18n cache isn't reused after encoding change: Check i18n cache isn't reused after encoding change:
$ cat > $TESTTMP/encodingchange.py << EOF $ cat > $TESTTMP/encodingchange.py << EOF
> from mercurial import encoding, registrar
> from mercurial.i18n import _ > from mercurial.i18n import _
> from mercurial import encoding, registrar
> cmdtable = {} > cmdtable = {}
pulkitUnsubmitted
Not Done

I am not sure why we need this but according to rest of the patch, these couple of imports should be in new lines.

pulkit: I am not sure why we need this but according to rest of the patch, these couple of imports…
durin42AuthorUnsubmitted
Not Done

The linter doesn't enforce that, so I didn't bother. Two imports felt short enough as to not explode it out into multiple lines.

The import checker does require that importing encoding or registrar has to come after importing _ from i18n.

durin42: The linter doesn't enforce that, so I didn't bother. Two imports felt short enough as to not…
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command(b'encodingchange', norepo=True) > @command(b'encodingchange', norepo=True)
> def encodingchange(ui): > def encodingchange(ui):
> for encode in (b'ascii', b'UTF-8', b'ascii', b'UTF-8'): > for encode in (b'ascii', b'UTF-8', b'ascii', b'UTF-8'):
> encoding.encoding = encode > encoding.encoding = encode
> ui.write(b'%s\n' % _(b'(EXPERIMENTAL)')) > ui.write(b'%s\n' % _(b'(EXPERIMENTAL)'))
> EOF > EOF
$ LANGUAGE=ja hg --config extensions.encodingchange=$TESTTMP/encodingchange.py encodingchange $ LANGUAGE=ja hg --config extensions.encodingchange=$TESTTMP/encodingchange.py encodingchange
(?????) (?????)
(\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc) (\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc)
(?????) (?????)
(\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc) (\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc)
#endif #endif

tests/test-lfs.t

$ cd .. $ cd ..
# Verify the repos # Verify the repos
$ cat > $TESTTMP/dumpflog.py << EOF $ cat > $TESTTMP/dumpflog.py << EOF
> # print raw revision sizes, flags, and hashes for certain files > # print raw revision sizes, flags, and hashes for certain files
> import hashlib > import hashlib
> from mercurial import revlog
> from mercurial.node import short > from mercurial.node import short
> from mercurial import revlog
> def hash(rawtext): > def hash(rawtext):
> h = hashlib.sha512() > h = hashlib.sha512()
> h.update(rawtext) > h.update(rawtext)
> return h.hexdigest()[:4] > return h.hexdigest()[:4]
> def reposetup(ui, repo): > def reposetup(ui, repo):
> # these 2 files are interesting > # these 2 files are interesting
> for name in ['l', 's']: > for name in ['l', 's']:
> fl = repo.file(name) > fl = repo.file(name)

tests/test-resolve.t

$ hg resolve -u $ hg resolve -u
$ cd .. $ cd ..
$ rmdir nested $ rmdir nested
don't allow marking or unmarking driver-resolved files don't allow marking or unmarking driver-resolved files
$ cat > $TESTTMP/markdriver.py << EOF $ cat > $TESTTMP/markdriver.py << EOF
> '''mark and unmark files as driver-resolved''' > '''mark and unmark files as driver-resolved'''
> from mercurial import merge, registrar, scmutil, pycompat > from mercurial import (
> merge,
> pycompat,
> registrar,
> scmutil,
> )
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command(b'markdriver', > @command(b'markdriver',
> [(b'u', b'unmark', None, b'')], > [(b'u', b'unmark', None, b'')],
> b'FILE...') > b'FILE...')
> def markdriver(ui, repo, *pats, **opts): > def markdriver(ui, repo, *pats, **opts):
> wlock = repo.wlock() > wlock = repo.wlock()
> opts = pycompat.byteskwargs(opts) > opts = pycompat.byteskwargs(opts)

tests/test-rollback.t

$ cd .. $ cd ..
I/O errors on stdio are handled properly (issue5658) I/O errors on stdio are handled properly (issue5658)
$ cat > badui.py << EOF $ cat > badui.py << EOF
> import errno > import errno
> from mercurial.i18n import _ > from mercurial.i18n import _
> from mercurial import ( > from mercurial import (
> registrar,
> error, > error,
> registrar,
> ui as uimod, > ui as uimod,
> ) > )
> >
> configtable = {} > configtable = {}
> configitem = registrar.configitem(configtable) > configitem = registrar.configitem(configtable)
> >
> configitem(b'ui', b'ioerrors', > configitem(b'ui', b'ioerrors',
> default=list, > default=list,

tests/test-split.t

#testcases obsstore-on obsstore-off #testcases obsstore-on obsstore-off
$ cat > $TESTTMP/editor.py <<EOF $ cat > $TESTTMP/editor.py <<EOF
> #!$PYTHON > #!$PYTHON
> import os, sys > import os
> import sys
> path = os.path.join(os.environ['TESTTMP'], 'messages') > path = os.path.join(os.environ['TESTTMP'], 'messages')
> messages = open(path).read().split('--\n') > messages = open(path).read().split('--\n')
> prompt = open(sys.argv[1]).read() > prompt = open(sys.argv[1]).read()
> sys.stdout.write(''.join('EDITOR: %s' % l for l in prompt.splitlines(True))) > sys.stdout.write(''.join('EDITOR: %s' % l for l in prompt.splitlines(True)))
> sys.stdout.flush() > sys.stdout.flush()
> with open(sys.argv[1], 'w') as f: > with open(sys.argv[1], 'w') as f:
> f.write(messages[0]) > f.write(messages[0])
> with open(path, 'w') as f: > with open(path, 'w') as f: