Mercurial > hg
diff tests/test-ssh.t @ 25495:c63bf97cf7c7
tests: restore 'python' and '$TESTDIR/' for dummyssh invocation
This is a backout of 46727fea7a00, and a partial backout of c3ecbf694904.
Windows won't execute 'dummyssh' directly, presumably because CreateProcess()
doesn't know how to execute a bash script:
$ hg clone -e "dummyssh" ssh://user@dummy/cloned sshclone
remote: 'dummyssh' is not recognized as an internal or external command,
remote: operable program or batch file.
abort: no suitable response from remote hg!
[255]
With the restoration of python as the executable, $TESTDIR needs to be restored
for these invocations, because python won't search $PATH for 'dummyssh':
$ hg clone -e "python dummyssh" ssh://user@dummy/cloned sshclone
remote: python: can't open file 'dummyssh': [Errno 2] No such file or directory
abort: no suitable response from remote hg!
[255]
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 09 Jun 2015 21:39:33 -0400 |
parents | d8e7b0781ad7 |
children | fa6ba7c9600b |
line wrap: on
line diff
--- a/tests/test-ssh.t Tue Jun 09 15:18:47 2015 -0700 +++ b/tests/test-ssh.t Tue Jun 09 21:39:33 2015 -0400 @@ -33,21 +33,21 @@ repo not found error - $ hg clone -e dummyssh ssh://user@dummy/nonexistent local + $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local remote: abort: there is no Mercurial repository here (.hg not found)! abort: no suitable response from remote hg! [255] non-existent absolute path - $ hg clone -e dummyssh ssh://user@dummy//`pwd`/nonexistent local + $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local remote: abort: there is no Mercurial repository here (.hg not found)! abort: no suitable response from remote hg! [255] clone remote via stream - $ hg clone -e dummyssh --uncompressed ssh://user@dummy/remote local-stream + $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream streaming all changes 4 files to transfer, 615 bytes of data transferred 615 bytes in * seconds (*) (glob) @@ -69,7 +69,7 @@ clone bookmarks via stream $ hg -R local-stream book mybook - $ hg clone -e dummyssh --uncompressed ssh://user@dummy/local-stream stream2 + $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 streaming all changes 4 files to transfer, 615 bytes of data transferred 615 bytes in * seconds (*) (glob) @@ -85,7 +85,7 @@ clone remote via pull - $ hg clone -e dummyssh ssh://user@dummy/remote local + $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local requesting all changes adding changesets adding manifests @@ -110,14 +110,14 @@ $ hg paths default = ssh://user@dummy/remote - $ hg pull -e dummyssh + $ hg pull -e "python \"$TESTDIR/dummyssh\"" pulling from ssh://user@dummy/remote searching for changes no changes found pull from wrong ssh URL - $ hg pull -e dummyssh ssh://user@dummy/doesnotexist + $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist pulling from ssh://user@dummy/doesnotexist remote: abort: there is no Mercurial repository here (.hg not found)! abort: no suitable response from remote hg! @@ -132,7 +132,7 @@ $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc $ echo "[ui]" >> .hg/hgrc - $ echo "ssh = dummyssh" >> .hg/hgrc + $ echo "ssh = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc find outgoing @@ -149,7 +149,7 @@ find incoming on the remote side - $ hg incoming -R ../remote -e dummyssh ssh://user@dummy/local + $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local comparing with ssh://user@dummy/local searching for changes changeset: 3:a28a9d1a809c @@ -162,7 +162,7 @@ find incoming on the remote side (using absolute path) - $ hg incoming -R ../remote -e dummyssh "ssh://user@dummy/`pwd`" + $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`" comparing with ssh://user@dummy/$TESTTMP/local searching for changes changeset: 3:a28a9d1a809c @@ -209,7 +209,7 @@ test pushkeys and bookmarks $ cd ../local - $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote namespaces + $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces bookmarks namespaces phases @@ -224,7 +224,7 @@ no changes found exporting bookmark foo [1] - $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote bookmarks + $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks foo 1160648e36cec0054048a7edc4110c6f84fde594 $ hg book -f foo $ hg push --traceback @@ -294,7 +294,7 @@ $ hg -R ../remote bookmark test $ hg -R ../remote bookmarks * test 4:6c0482d977a3 - $ hg clone -e dummyssh ssh://user@dummy/remote local-bookmarks + $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks requesting all changes adding changesets adding manifests @@ -321,21 +321,21 @@ Test remote paths with spaces (issue2983): - $ hg init --ssh dummyssh "ssh://user@dummy/a repo" + $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" $ touch "$TESTTMP/a repo/test" $ hg -R 'a repo' commit -A -m "test" adding test $ hg -R 'a repo' tag tag - $ hg id --ssh dummyssh "ssh://user@dummy/a repo" + $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" 73649e48688a - $ hg id --ssh dummyssh "ssh://user@dummy/a repo#noNoNO" + $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO" abort: unknown revision 'noNoNO'! [255] Test (non-)escaping of remote paths with spaces when cloning (issue3145): - $ hg clone --ssh dummyssh "ssh://user@dummy/a repo" + $ hg clone --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" destination directory: a repo abort: destination 'a repo' is not empty [255] @@ -424,7 +424,7 @@ > [paths] > default-push = ssh://user@dummy/remote > [ui] - > ssh = dummyssh + > ssh = python "$TESTDIR/dummyssh" > [extensions] > localwrite = localwrite.py > EOF @@ -445,7 +445,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 python ".*/dummyssh" user@dummy ('|")hg -R remote serve --stdio('|") (re) sending hello command sending between command remote: 345