This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3630

py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t
ClosedPublic

Authored by pulkit on May 20 2018, 8:24 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe69628f36196: py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t
Summary
  1. skip-blame because just b'' prefixes

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.May 20 2018, 8:24 AM
indygreg accepted this revision.May 21 2018, 2:24 PM
This revision is now accepted and ready to land.May 21 2018, 2:24 PM
Closed by commit rHGe69628f36196: py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t (authored by pulkit). · Explain WhyMay 21 2018, 2:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-ssh-bundle1.t (6 lines)
Mtests/test-ssh.t (6 lines)

Diff 8855

tests/test-ssh-bundle1.t

updating to branch default updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd stderr-ordering $ cd stderr-ordering
$ cat >> localwrite.py << EOF $ cat >> localwrite.py << EOF
> from mercurial import exchange, extensions > from mercurial import exchange, extensions
> >
> def wrappedpush(orig, repo, *args, **kwargs): > def wrappedpush(orig, repo, *args, **kwargs):
> res = orig(repo, *args, **kwargs) > res = orig(repo, *args, **kwargs)
> repo.ui.write('local stdout\n') > repo.ui.write(b'local stdout\n')
> return res > return res
> >
> def extsetup(ui): > def extsetup(ui):
> extensions.wrapfunction(exchange, 'push', wrappedpush) > extensions.wrapfunction(exchange, b'push', wrappedpush)
> EOF > EOF
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [paths] > [paths]
> default-push = ssh://user@dummy/remote > default-push = ssh://user@dummy/remote
> [ui] > [ui]
> ssh = "$PYTHON" "$TESTDIR/dummyssh" > ssh = "$PYTHON" "$TESTDIR/dummyssh"
> [extensions] > [extensions]
Got arguments 1:user@dummy 2:hg -R remote serve --stdio Got arguments 1:user@dummy 2:hg -R remote serve --stdio
changegroup-in-remote hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP changegroup-in-remote hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
Got arguments 1:user@dummy 2:hg -R remote serve --stdio Got arguments 1:user@dummy 2:hg -R remote serve --stdio
remote hook failure is attributed to remote remote hook failure is attributed to remote
$ cat > $TESTTMP/failhook << EOF $ cat > $TESTTMP/failhook << EOF
> def hook(ui, repo, **kwargs): > def hook(ui, repo, **kwargs):
> ui.write('hook failure!\n') > ui.write(b'hook failure!\n')
> ui.flush() > ui.flush()
> return 1 > return 1
> EOF > EOF
$ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc
$ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout $ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout
$ cd hookout $ cd hookout

tests/test-ssh.t

updating to branch default updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd stderr-ordering $ cd stderr-ordering
$ cat >> localwrite.py << EOF $ cat >> localwrite.py << EOF
> from mercurial import exchange, extensions > from mercurial import exchange, extensions
> >
> def wrappedpush(orig, repo, *args, **kwargs): > def wrappedpush(orig, repo, *args, **kwargs):
> res = orig(repo, *args, **kwargs) > res = orig(repo, *args, **kwargs)
> repo.ui.write('local stdout\n') > repo.ui.write(b'local stdout\n')
> repo.ui.flush() > repo.ui.flush()
> return res > return res
> >
> def extsetup(ui): > def extsetup(ui):
> extensions.wrapfunction(exchange, 'push', wrappedpush) > extensions.wrapfunction(exchange, b'push', wrappedpush)
> EOF > EOF
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [paths] > [paths]
> default-push = ssh://user@dummy/remote > default-push = ssh://user@dummy/remote
> [ui] > [ui]
> ssh = "$PYTHON" "$TESTDIR/dummyssh" > ssh = "$PYTHON" "$TESTDIR/dummyssh"
> [extensions] > [extensions]
Got arguments 1:user@dummy 2:hg -R remote serve --stdio Got arguments 1:user@dummy 2:hg -R remote serve --stdio
changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
Got arguments 1:user@dummy 2:hg -R remote serve --stdio Got arguments 1:user@dummy 2:hg -R remote serve --stdio
remote hook failure is attributed to remote remote hook failure is attributed to remote
$ cat > $TESTTMP/failhook << EOF $ cat > $TESTTMP/failhook << EOF
> def hook(ui, repo, **kwargs): > def hook(ui, repo, **kwargs):
> ui.write('hook failure!\n') > ui.write(b'hook failure!\n')
> ui.flush() > ui.flush()
> return 1 > return 1
> EOF > EOF
$ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc
$ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout $ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout
$ cd hookout $ cd hookout