This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11244

tests: setup dummyssh as the default ssh
ClosedPublic

Authored by valentin.gatienbaron on Aug 2 2021, 10:25 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa28a7dcb9158: tests: setup dummyssh as the default ssh
Summary

To significantly reduce boilerplate in tests. One test is updated to
show that it works, I expect to do the rest in follow up commits.

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 accepted this revision.Aug 4 2021, 4:48 AM
This revision is now accepted and ready to land.Aug 4 2021, 4:48 AM
marmoute added a subscriber: marmoute.Aug 5 2021, 1:04 PM

That one is quite simple and is probably has some value for this to be true for 5.9. So taking the first patch of the series for 5.9 might be a good idea.

Alphare added a subscriber: Alphare.Aug 25 2021, 5:07 AM

@pulkit What's the status of this?

Alphare added a comment.Aug 26 2021, 5:33 AM

This stack also looks good to me. If @pulkit doesn't take it today, I'll take it tomorrow.

valentin.gatienbaron added a commit: rHGa28a7dcb9158: tests: setup dummyssh as the default ssh.Aug 30 2021, 6:25 AM
Closed by commit rHGa28a7dcb9158: tests: setup dummyssh as the default ssh (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30134

tests/run-tests.py

with open(path, 'wb') as hgrc: with open(path, 'wb') as hgrc:
hgrc.write(b'[ui]\n') hgrc.write(b'[ui]\n')
hgrc.write(b'slash = True\n') hgrc.write(b'slash = True\n')
hgrc.write(b'interactive = False\n') hgrc.write(b'interactive = False\n')
hgrc.write(b'detailed-exit-code = True\n') hgrc.write(b'detailed-exit-code = True\n')
hgrc.write(b'merge = internal:merge\n') hgrc.write(b'merge = internal:merge\n')
hgrc.write(b'mergemarkers = detailed\n') hgrc.write(b'mergemarkers = detailed\n')
hgrc.write(b'promptecho = True\n') hgrc.write(b'promptecho = True\n')
dummyssh = os.path.join(self._testdir, b'dummyssh')
hgrc.write(b'ssh = "%s" "%s"\n' % (PYTHON, dummyssh))
hgrc.write(b'timeout.warn=15\n') hgrc.write(b'timeout.warn=15\n')
hgrc.write(b'[chgserver]\n') hgrc.write(b'[chgserver]\n')
hgrc.write(b'idletimeout=60\n') hgrc.write(b'idletimeout=60\n')
hgrc.write(b'[defaults]\n') hgrc.write(b'[defaults]\n')
hgrc.write(b'[devel]\n') hgrc.write(b'[devel]\n')
hgrc.write(b'all-warnings = true\n') hgrc.write(b'all-warnings = true\n')
hgrc.write(b'default-date = 0 0\n') hgrc.write(b'default-date = 0 0\n')
hgrc.write(b'[largefiles]\n') hgrc.write(b'[largefiles]\n')

tests/test-basic.t

largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.promptecho=True ui.promptecho=True
ui.ssh=* (glob)
ui.timeout.warn=15 ui.timeout.warn=15
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value web.server-header=testing stub value
#endif #endif
$ hg init t $ hg init t
$ cd t $ cd t

tests/test-commandserver.t

format.exp-dirstate-v2=1 (dirstate-v2 !) format.exp-dirstate-v2=1 (dirstate-v2 !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.ssh=* (glob)
ui.timeout.warn=15 ui.timeout.warn=15
ui.foo=bar ui.foo=bar
ui.nontty=true ui.nontty=true
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value web.server-header=testing stub value
*** runcommand init foo *** runcommand init foo
*** runcommand -R foo showconfig ui defaults *** runcommand -R foo showconfig ui defaults
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.detailed-exit-code=True ui.detailed-exit-code=True
ui.merge=internal:merge ui.merge=internal:merge
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.ssh=* (glob)
ui.timeout.warn=15 ui.timeout.warn=15
ui.nontty=true ui.nontty=true
#endif #endif
$ rm -R foo $ rm -R foo
#if windows #if windows
$ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH" $ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH"

tests/test-config.t

$ HGRCPATH=configs hg config section.key $ HGRCPATH=configs hg config section.key
99 99
Listing all config options Listing all config options
========================== ==========================
The feature is experimental and behavior may varies. This test exists to make sure the code is run. We grep it to avoid too much variability in its current experimental state. The feature is experimental and behavior may varies. This test exists to make sure the code is run. We grep it to avoid too much variability in its current experimental state.
$ hg config --exp-all-known | grep commit $ hg config --exp-all-known | grep commit | grep -v ssh
commands.commit.interactive.git=False commands.commit.interactive.git=False
commands.commit.interactive.ignoreblanklines=False commands.commit.interactive.ignoreblanklines=False
commands.commit.interactive.ignorews=False commands.commit.interactive.ignorews=False
commands.commit.interactive.ignorewsamount=False commands.commit.interactive.ignorewsamount=False
commands.commit.interactive.ignorewseol=False commands.commit.interactive.ignorewseol=False
commands.commit.interactive.nobinary=False commands.commit.interactive.nobinary=False
commands.commit.interactive.nodates=False commands.commit.interactive.nodates=False
commands.commit.interactive.noprefix=False commands.commit.interactive.noprefix=False

tests/test-ssh-bundle1.t

remote: KABOOM remote: KABOOM
remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !) remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !)
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote $ hg pull --debug ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
remote: 444 (sshv1 no-rust !) remote: 444 (sshv1 no-rust !)
remote: 463 (sshv1 rust !) remote: 463 (sshv1 rust !)
protocol upgraded to exp-ssh-v2-0003 (sshv2 !) protocol upgraded to exp-ssh-v2-0003 (sshv2 !)
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-rust !) remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-rust !)
remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,persistent-nodemap,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (rust !) remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,persistent-nodemap,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (rust !)

tests/test-ssh-clone-r.t

(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip $ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd .. $ cd ..
clone remote via stream clone remote via stream
$ for i in 0 1 2 3 4 5 6 7 8; do $ for i in 0 1 2 3 4 5 6 7 8; do
> hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream -r "$i" ssh://user@dummy/remote test-"$i" > hg clone --stream -r "$i" ssh://user@dummy/remote test-"$i"
> if cd test-"$i"; then > if cd test-"$i"; then
> hg verify > hg verify
> cd .. > cd ..
> fi > fi
> done > done
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 9 changesets with 7 changes to 4 files checked 9 changesets with 7 changes to 4 files
$ cd .. $ cd ..
$ cd test-1 $ cd test-1
$ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote $ hg pull -r 4 ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets c70afb1ee985 new changesets c70afb1ee985
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 2 changes to 1 files checked 3 changesets with 2 changes to 1 files
$ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote $ hg pull ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 6 changesets with 5 changes to 4 files added 6 changesets with 5 changes to 4 files
new changesets 4ce51a113780:916f1afdef90 new changesets 4ce51a113780:916f1afdef90
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ cd .. $ cd ..
$ cd test-2 $ cd test-2
$ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote $ hg pull -r 5 ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads) added 2 changesets with 0 changes to 0 files (+1 heads)
new changesets c70afb1ee985:f03ae5a9b979 new changesets c70afb1ee985:f03ae5a9b979
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 5 changesets with 3 changes to 1 files checked 5 changesets with 3 changes to 1 files
$ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote $ hg pull ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 4 changes to 4 files added 4 changesets with 4 changes to 4 files
new changesets 93ee6ab32777:916f1afdef90 new changesets 93ee6ab32777:916f1afdef90
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 9 changesets with 7 changes to 4 files checked 9 changesets with 7 changes to 4 files
$ cd .. $ cd ..

tests/test-ssh.t

remote: KABOOM IN PROCESS remote: KABOOM IN PROCESS
remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !) remote: added 1 changesets with 1 changes to 1 files (no-py3 chg !)
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re)
sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !) sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
devel-peer-request: hello+between devel-peer-request: hello+between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending hello command sending hello command
sending between command sending between command
remote: 444 (sshv1 no-rust !) remote: 444 (sshv1 no-rust !)
remote: 463 (sshv1 rust !) remote: 463 (sshv1 rust !)
protocol upgraded to exp-ssh-v2-0003 (sshv2 !) protocol upgraded to exp-ssh-v2-0003 (sshv2 !)