Mercurial > hg-stable
changeset 47950:a28a7dcb9158
tests: setup dummyssh as the default ssh
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.
Differential Revision: https://phab.mercurial-scm.org/D11244
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Mon, 02 Aug 2021 21:10:42 -0400 |
| parents | 496a8e383aeb |
| children | 9c4204b7f3e4 |
| files | tests/run-tests.py tests/test-basic.t tests/test-commandserver.t tests/test-config.t tests/test-ssh-bundle1.t tests/test-ssh-clone-r.t tests/test-ssh.t |
| diffstat | 7 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/run-tests.py Mon Aug 02 21:10:42 2021 -0400 @@ -1554,6 +1554,8 @@ hgrc.write(b'merge = internal:merge\n') hgrc.write(b'mergemarkers = detailed\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'[chgserver]\n') hgrc.write(b'idletimeout=60\n')
--- a/tests/test-basic.t Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/test-basic.t Mon Aug 02 21:10:42 2021 -0400 @@ -15,6 +15,7 @@ ui.merge=internal:merge ui.mergemarkers=detailed ui.promptecho=True + ui.ssh=* (glob) ui.timeout.warn=15 web.address=localhost web\.ipv6=(?:True|False) (re)
--- a/tests/test-commandserver.t Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/test-commandserver.t Mon Aug 02 21:10:42 2021 -0400 @@ -226,6 +226,7 @@ ui.detailed-exit-code=True ui.merge=internal:merge ui.mergemarkers=detailed + ui.ssh=* (glob) ui.timeout.warn=15 ui.foo=bar ui.nontty=true @@ -239,6 +240,7 @@ ui.detailed-exit-code=True ui.merge=internal:merge ui.mergemarkers=detailed + ui.ssh=* (glob) ui.timeout.warn=15 ui.nontty=true #endif
--- a/tests/test-config.t Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/test-config.t Mon Aug 02 21:10:42 2021 -0400 @@ -413,7 +413,7 @@ 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.ignoreblanklines=False commands.commit.interactive.ignorews=False
--- a/tests/test-ssh-bundle1.t Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/test-ssh-bundle1.t Mon Aug 02 21:10:42 2021 -0400 @@ -486,7 +486,7 @@ $ hg pull --debug 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 hello command sending between command
--- a/tests/test-ssh-clone-r.t Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/test-ssh-clone-r.t Mon Aug 02 21:10:42 2021 -0400 @@ -28,7 +28,7 @@ clone remote via stream $ 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 > hg verify > cd .. @@ -160,7 +160,7 @@ checked 9 changesets with 7 changes to 4 files $ cd .. $ 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 searching for changes adding changesets @@ -175,7 +175,7 @@ crosschecking files in changesets and manifests checking 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 searching for changes adding changesets @@ -186,7 +186,7 @@ (run 'hg update' to get a working copy) $ cd .. $ 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 searching for changes adding changesets @@ -201,7 +201,7 @@ crosschecking files in changesets and manifests checking 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 searching for changes adding changesets
--- a/tests/test-ssh.t Tue Aug 24 21:25:35 2021 +0200 +++ b/tests/test-ssh.t Mon Aug 02 21:10:42 2021 -0400 @@ -540,7 +540,7 @@ $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes 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 !) devel-peer-request: hello+between devel-peer-request: pairs: 81 bytes