Mercurial > hg-stable
changeset 25476:46727fea7a00
tests: simplify calls to dummyssh
dummyssh is marked executable and is in the path, no need for python,
TESTDIR, or quotes.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2015 15:02:49 -0500 |
| parents | c3ecbf694904 |
| children | a372f7b4463b |
| files | tests/test-bookmarks-pushpull.t tests/test-bundle2-exchange.t tests/test-bundle2-format.t tests/test-bundle2-pushback.t tests/test-bundle2-remote-changegroup.t tests/test-init.t tests/test-largefiles-wireproto.t tests/test-ssh-bundle1.t tests/test-ssh-clone-r.t tests/test-ssh.t tests/test-subrepo-relative-path.t |
| diffstat | 11 files changed, 58 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-bookmarks-pushpull.t Mon Jun 08 15:02:49 2015 -0500 @@ -734,7 +734,7 @@ > ssh=ssh://user@dummy/issue4455-dest > http=http://localhost:$HGPORT/ > [ui] - > ssh=python "$TESTDIR/dummyssh" + > ssh=dummyssh > EOF $ cat >> ../issue4455-dest/.hg/hgrc << EOF > [hooks]
--- a/tests/test-bundle2-exchange.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-bundle2-exchange.t Mon Jun 08 15:02:49 2015 -0500 @@ -18,7 +18,7 @@ > bundle2-exp=True > bundle2-output-capture=True > [ui] - > ssh=python "$TESTDIR/dummyssh" + > ssh=dummyssh > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [web] > push_ssl = false
--- a/tests/test-bundle2-format.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-bundle2-format.t Mon Jun 08 15:02:49 2015 -0500 @@ -210,7 +210,7 @@ > bundle2-exp=True > evolution=createmarkers > [ui] - > ssh=python "$TESTDIR/dummyssh" + > ssh=dummyssh > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [web] > push_ssl = false
--- a/tests/test-bundle2-pushback.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-bundle2-pushback.t Mon Jun 08 15:02:49 2015 -0500 @@ -25,7 +25,7 @@ $ cat >> $HGRCPATH <<EOF > [ui] - > ssh = python "$TESTDIR/dummyssh" + > ssh = dummyssh > username = nobody <no.reply@example.com> > > [alias]
--- a/tests/test-bundle2-remote-changegroup.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-bundle2-remote-changegroup.t Mon Jun 08 15:02:49 2015 -0500 @@ -81,7 +81,7 @@ > [experimental] > bundle2-exp=True > [ui] - > ssh=python "$TESTDIR/dummyssh" + > ssh=dummyssh > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > EOF
--- a/tests/test-init.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-init.t Mon Jun 08 15:02:49 2015 -0500 @@ -84,7 +84,7 @@ init+push to remote2 - $ hg init -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2 + $ hg init -e dummyssh ssh://user@dummy/remote2 $ hg incoming -R remote2 local comparing with local changeset: 0:08b9e9f63b32 @@ -94,7 +94,7 @@ summary: init - $ hg push -R local -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2 + $ hg push -R local -e dummyssh ssh://user@dummy/remote2 pushing to ssh://user@dummy/remote2 searching for changes remote: adding changesets @@ -104,7 +104,7 @@ clone to remote1 - $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1 + $ hg clone -e dummyssh local ssh://user@dummy/remote1 searching for changes remote: adding changesets remote: adding manifests @@ -112,7 +112,7 @@ remote: added 1 changesets with 1 changes to 1 files The largefiles extension doesn't crash - $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remotelf --config extensions.largefiles= + $ hg clone -e dummyssh local ssh://user@dummy/remotelf --config extensions.largefiles= searching for changes remote: adding changesets remote: adding manifests @@ -121,14 +121,14 @@ init to existing repo - $ hg init -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1 + $ hg init -e dummyssh ssh://user@dummy/remote1 abort: repository remote1 already exists! abort: could not create remote repo! [255] clone to existing repo - $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1 + $ hg clone -e dummyssh local ssh://user@dummy/remote1 abort: repository remote1 already exists! abort: could not create remote repo! [255] @@ -224,7 +224,7 @@ $ hg -R local bookmark test $ hg -R local bookmarks * test 0:08b9e9f63b32 - $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote-bookmarks + $ hg clone -e dummyssh local ssh://user@dummy/remote-bookmarks searching for changes remote: adding changesets remote: adding manifests
--- a/tests/test-largefiles-wireproto.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-largefiles-wireproto.t Mon Jun 08 15:02:49 2015 -0500 @@ -110,7 +110,7 @@ #endif vanilla clients locked out from largefiles ssh repos - $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5 + $ hg --config extensions.largefiles=! clone -e dummyssh ssh://user@dummy/r4 r5 remote: remote: This repository uses the largefiles extension. remote:
--- a/tests/test-ssh-bundle1.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-ssh-bundle1.t Mon Jun 08 15:02:49 2015 -0500 @@ -42,21 +42,21 @@ repo not found error - $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream + $ hg clone -e 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) @@ -78,7 +78,7 @@ clone bookmarks via stream $ hg -R local-stream book mybook - $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 + $ hg clone -e 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) @@ -94,7 +94,7 @@ clone remote via pull - $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local + $ hg clone -e dummyssh ssh://user@dummy/remote local requesting all changes adding changesets adding manifests @@ -119,14 +119,14 @@ $ hg paths default = ssh://user@dummy/remote - $ hg pull -e "python \"$TESTDIR/dummyssh\"" + $ hg pull -e dummyssh pulling from ssh://user@dummy/remote searching for changes no changes found pull from wrong ssh URL - $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist + $ hg pull -e 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! @@ -141,7 +141,7 @@ $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc $ echo "[ui]" >> .hg/hgrc - $ echo "ssh = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc + $ echo "ssh = dummyssh" >> .hg/hgrc find outgoing @@ -158,7 +158,7 @@ find incoming on the remote side - $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local + $ hg incoming -R ../remote -e dummyssh ssh://user@dummy/local comparing with ssh://user@dummy/local searching for changes changeset: 3:a28a9d1a809c @@ -171,7 +171,7 @@ find incoming on the remote side (using absolute path) - $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`" + $ hg incoming -R ../remote -e dummyssh "ssh://user@dummy/`pwd`" comparing with ssh://user@dummy/$TESTTMP/local searching for changes changeset: 3:a28a9d1a809c @@ -218,7 +218,7 @@ test pushkeys and bookmarks $ cd ../local - $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces + $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote namespaces bookmarks namespaces phases @@ -233,7 +233,7 @@ no changes found exporting bookmark foo [1] - $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks + $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote bookmarks foo 1160648e36cec0054048a7edc4110c6f84fde594 $ hg book -f foo $ hg push --traceback @@ -303,7 +303,7 @@ $ hg -R ../remote bookmark test $ hg -R ../remote bookmarks * test 4:6c0482d977a3 - $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks + $ hg clone -e dummyssh ssh://user@dummy/remote local-bookmarks requesting all changes adding changesets adding manifests @@ -330,21 +330,21 @@ Test remote paths with spaces (issue2983): - $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" + $ hg init --ssh 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 "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" + $ hg id --ssh dummyssh "ssh://user@dummy/a repo" 73649e48688a - $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO" + $ hg id --ssh 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 "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" + $ hg clone --ssh dummyssh "ssh://user@dummy/a repo" destination directory: a repo abort: destination 'a repo' is not empty [255] @@ -436,7 +436,7 @@ > [paths] > default-push = ssh://user@dummy/remote > [ui] - > ssh = python "$TESTDIR/dummyssh" + > ssh = dummyssh > [extensions] > localwrite = localwrite.py > EOF @@ -457,7 +457,7 @@ $ hg pull --debug ssh://user@dummy/remote pulling from ssh://user@dummy/remote - running python "*/dummyssh" user@dummy 'hg -R remote serve --stdio' (glob) + running dummyssh user@dummy 'hg -R remote serve --stdio' sending hello command sending between command remote: 286
--- a/tests/test-ssh-clone-r.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-ssh-clone-r.t Mon Jun 08 15:02:49 2015 -0500 @@ -17,7 +17,7 @@ clone remote via stream $ for i in 0 1 2 3 4 5 6 7 8; do - > hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed -r "$i" ssh://user@dummy/remote test-"$i" + > hg clone -e dummyssh --uncompressed -r "$i" ssh://user@dummy/remote test-"$i" > if cd test-"$i"; then > hg verify > cd .. @@ -139,7 +139,7 @@ 4 files, 9 changesets, 7 total revisions $ cd .. $ cd test-1 - $ hg pull -e "python \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote + $ hg pull -e dummyssh -r 4 ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes adding changesets @@ -153,7 +153,7 @@ crosschecking files in changesets and manifests checking files 1 files, 3 changesets, 2 total revisions - $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote + $ hg pull -e dummyssh ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes adding changesets @@ -163,7 +163,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 -e dummyssh -r 5 ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes adding changesets @@ -177,7 +177,7 @@ crosschecking files in changesets and manifests checking files 1 files, 5 changesets, 3 total revisions - $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote + $ hg pull -e dummyssh ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes adding changesets
--- a/tests/test-ssh.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-ssh.t Mon Jun 08 15:02:49 2015 -0500 @@ -33,21 +33,21 @@ repo not found error - $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" + $ hg pull -e dummyssh pulling from ssh://user@dummy/remote searching for changes no changes found pull from wrong ssh URL - $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist + $ hg pull -e 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 = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc + $ echo "ssh = dummyssh" >> .hg/hgrc find outgoing @@ -149,7 +149,7 @@ find incoming on the remote side - $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local + $ hg incoming -R ../remote -e 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 "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`" + $ hg incoming -R ../remote -e 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="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces + $ hg debugpushkey --config ui.ssh=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="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks + $ hg debugpushkey --config ui.ssh=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 "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks + $ hg clone -e 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 "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" + $ hg init --ssh 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 "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" + $ hg id --ssh dummyssh "ssh://user@dummy/a repo" 73649e48688a - $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO" + $ hg id --ssh 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 "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" + $ hg clone --ssh 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 = python "$TESTDIR/dummyssh" + > ssh = dummyssh > [extensions] > localwrite = localwrite.py > EOF @@ -445,7 +445,7 @@ $ hg pull --debug ssh://user@dummy/remote pulling from ssh://user@dummy/remote - running python "*/dummyssh" user@dummy 'hg -R remote serve --stdio' (glob) + running dummyssh user@dummy 'hg -R remote serve --stdio' sending hello command sending between command remote: 286
--- a/tests/test-subrepo-relative-path.t Mon Jun 08 17:33:32 2015 -0500 +++ b/tests/test-subrepo-relative-path.t Mon Jun 08 15:02:49 2015 -0500 @@ -74,7 +74,7 @@ subrepo paths with ssh urls - $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone + $ hg clone -e dummyssh ssh://user@dummy/cloned sshclone requesting all changes adding changesets adding manifests @@ -89,7 +89,7 @@ added 1 changesets with 1 changes to 1 files 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned + $ hg -R sshclone push -e dummyssh ssh://user@dummy/`pwd`/cloned pushing to ssh://user@dummy/$TESTTMP/cloned pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub searching for changes