##// END OF EJS Templates
tests: simplify calls to dummyssh...
Matt Mackall -
r25476:46727fea default
parent child Browse files
Show More
@@ -734,7 +734,7 b' Check hook preventing push (issue4455)'
734 734 > ssh=ssh://user@dummy/issue4455-dest
735 735 > http=http://localhost:$HGPORT/
736 736 > [ui]
737 > ssh=python "$TESTDIR/dummyssh"
737 > ssh=dummyssh
738 738 > EOF
739 739 $ cat >> ../issue4455-dest/.hg/hgrc << EOF
740 740 > [hooks]
@@ -18,7 +18,7 b' enable obsolescence'
18 18 > bundle2-exp=True
19 19 > bundle2-output-capture=True
20 20 > [ui]
21 > ssh=python "$TESTDIR/dummyssh"
21 > ssh=dummyssh
22 22 > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
23 23 > [web]
24 24 > push_ssl = false
@@ -210,7 +210,7 b' Create an extension to test bundle2 API'
210 210 > bundle2-exp=True
211 211 > evolution=createmarkers
212 212 > [ui]
213 > ssh=python "$TESTDIR/dummyssh"
213 > ssh=dummyssh
214 214 > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
215 215 > [web]
216 216 > push_ssl = false
@@ -25,7 +25,7 b''
25 25
26 26 $ cat >> $HGRCPATH <<EOF
27 27 > [ui]
28 > ssh = python "$TESTDIR/dummyssh"
28 > ssh = dummyssh
29 29 > username = nobody <no.reply@example.com>
30 30 >
31 31 > [alias]
@@ -81,7 +81,7 b' Start a simple HTTP server to serve bund'
81 81 > [experimental]
82 82 > bundle2-exp=True
83 83 > [ui]
84 > ssh=python "$TESTDIR/dummyssh"
84 > ssh=dummyssh
85 85 > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
86 86 > EOF
87 87
@@ -84,7 +84,7 b' test failure'
84 84
85 85 init+push to remote2
86 86
87 $ hg init -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2
87 $ hg init -e dummyssh ssh://user@dummy/remote2
88 88 $ hg incoming -R remote2 local
89 89 comparing with local
90 90 changeset: 0:08b9e9f63b32
@@ -94,7 +94,7 b' init+push to remote2'
94 94 summary: init
95 95
96 96
97 $ hg push -R local -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2
97 $ hg push -R local -e dummyssh ssh://user@dummy/remote2
98 98 pushing to ssh://user@dummy/remote2
99 99 searching for changes
100 100 remote: adding changesets
@@ -104,7 +104,7 b' init+push to remote2'
104 104
105 105 clone to remote1
106 106
107 $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1
107 $ hg clone -e dummyssh local ssh://user@dummy/remote1
108 108 searching for changes
109 109 remote: adding changesets
110 110 remote: adding manifests
@@ -112,7 +112,7 b' clone to remote1'
112 112 remote: added 1 changesets with 1 changes to 1 files
113 113
114 114 The largefiles extension doesn't crash
115 $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remotelf --config extensions.largefiles=
115 $ hg clone -e dummyssh local ssh://user@dummy/remotelf --config extensions.largefiles=
116 116 searching for changes
117 117 remote: adding changesets
118 118 remote: adding manifests
@@ -121,14 +121,14 b" The largefiles extension doesn't crash"
121 121
122 122 init to existing repo
123 123
124 $ hg init -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1
124 $ hg init -e dummyssh ssh://user@dummy/remote1
125 125 abort: repository remote1 already exists!
126 126 abort: could not create remote repo!
127 127 [255]
128 128
129 129 clone to existing repo
130 130
131 $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1
131 $ hg clone -e dummyssh local ssh://user@dummy/remote1
132 132 abort: repository remote1 already exists!
133 133 abort: could not create remote repo!
134 134 [255]
@@ -224,7 +224,7 b' clone bookmarks'
224 224 $ hg -R local bookmark test
225 225 $ hg -R local bookmarks
226 226 * test 0:08b9e9f63b32
227 $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote-bookmarks
227 $ hg clone -e dummyssh local ssh://user@dummy/remote-bookmarks
228 228 searching for changes
229 229 remote: adding changesets
230 230 remote: adding manifests
@@ -110,7 +110,7 b' used all HGPORTs, kill all daemons'
110 110 #endif
111 111
112 112 vanilla clients locked out from largefiles ssh repos
113 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
113 $ hg --config extensions.largefiles=! clone -e dummyssh ssh://user@dummy/r4 r5
114 114 remote:
115 115 remote: This repository uses the largefiles extension.
116 116 remote:
@@ -42,21 +42,21 b' configure for serving'
42 42
43 43 repo not found error
44 44
45 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local
45 $ hg clone -e dummyssh ssh://user@dummy/nonexistent local
46 46 remote: abort: there is no Mercurial repository here (.hg not found)!
47 47 abort: no suitable response from remote hg!
48 48 [255]
49 49
50 50 non-existent absolute path
51 51
52 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local
52 $ hg clone -e dummyssh ssh://user@dummy//`pwd`/nonexistent local
53 53 remote: abort: there is no Mercurial repository here (.hg not found)!
54 54 abort: no suitable response from remote hg!
55 55 [255]
56 56
57 57 clone remote via stream
58 58
59 $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream
59 $ hg clone -e dummyssh --uncompressed ssh://user@dummy/remote local-stream
60 60 streaming all changes
61 61 4 files to transfer, 615 bytes of data
62 62 transferred 615 bytes in * seconds (*) (glob)
@@ -78,7 +78,7 b' clone remote via stream'
78 78 clone bookmarks via stream
79 79
80 80 $ hg -R local-stream book mybook
81 $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2
81 $ hg clone -e dummyssh --uncompressed ssh://user@dummy/local-stream stream2
82 82 streaming all changes
83 83 4 files to transfer, 615 bytes of data
84 84 transferred 615 bytes in * seconds (*) (glob)
@@ -94,7 +94,7 b' clone bookmarks via stream'
94 94
95 95 clone remote via pull
96 96
97 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
97 $ hg clone -e dummyssh ssh://user@dummy/remote local
98 98 requesting all changes
99 99 adding changesets
100 100 adding manifests
@@ -119,14 +119,14 b' empty default pull'
119 119
120 120 $ hg paths
121 121 default = ssh://user@dummy/remote
122 $ hg pull -e "python \"$TESTDIR/dummyssh\""
122 $ hg pull -e dummyssh
123 123 pulling from ssh://user@dummy/remote
124 124 searching for changes
125 125 no changes found
126 126
127 127 pull from wrong ssh URL
128 128
129 $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist
129 $ hg pull -e dummyssh ssh://user@dummy/doesnotexist
130 130 pulling from ssh://user@dummy/doesnotexist
131 131 remote: abort: there is no Mercurial repository here (.hg not found)!
132 132 abort: no suitable response from remote hg!
@@ -141,7 +141,7 b' updating rc'
141 141
142 142 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
143 143 $ echo "[ui]" >> .hg/hgrc
144 $ echo "ssh = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc
144 $ echo "ssh = dummyssh" >> .hg/hgrc
145 145
146 146 find outgoing
147 147
@@ -158,7 +158,7 b' find outgoing'
158 158
159 159 find incoming on the remote side
160 160
161 $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local
161 $ hg incoming -R ../remote -e dummyssh ssh://user@dummy/local
162 162 comparing with ssh://user@dummy/local
163 163 searching for changes
164 164 changeset: 3:a28a9d1a809c
@@ -171,7 +171,7 b' find incoming on the remote side'
171 171
172 172 find incoming on the remote side (using absolute path)
173 173
174 $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`"
174 $ hg incoming -R ../remote -e dummyssh "ssh://user@dummy/`pwd`"
175 175 comparing with ssh://user@dummy/$TESTTMP/local
176 176 searching for changes
177 177 changeset: 3:a28a9d1a809c
@@ -218,7 +218,7 b' check remote tip'
218 218 test pushkeys and bookmarks
219 219
220 220 $ cd ../local
221 $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces
221 $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote namespaces
222 222 bookmarks
223 223 namespaces
224 224 phases
@@ -233,7 +233,7 b' test pushkeys and bookmarks'
233 233 no changes found
234 234 exporting bookmark foo
235 235 [1]
236 $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks
236 $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote bookmarks
237 237 foo 1160648e36cec0054048a7edc4110c6f84fde594
238 238 $ hg book -f foo
239 239 $ hg push --traceback
@@ -303,7 +303,7 b' clone bookmarks'
303 303 $ hg -R ../remote bookmark test
304 304 $ hg -R ../remote bookmarks
305 305 * test 4:6c0482d977a3
306 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks
306 $ hg clone -e dummyssh ssh://user@dummy/remote local-bookmarks
307 307 requesting all changes
308 308 adding changesets
309 309 adding manifests
@@ -330,21 +330,21 b' hide outer repo'
330 330
331 331 Test remote paths with spaces (issue2983):
332 332
333 $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
333 $ hg init --ssh dummyssh "ssh://user@dummy/a repo"
334 334 $ touch "$TESTTMP/a repo/test"
335 335 $ hg -R 'a repo' commit -A -m "test"
336 336 adding test
337 337 $ hg -R 'a repo' tag tag
338 $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
338 $ hg id --ssh dummyssh "ssh://user@dummy/a repo"
339 339 73649e48688a
340 340
341 $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO"
341 $ hg id --ssh dummyssh "ssh://user@dummy/a repo#noNoNO"
342 342 abort: unknown revision 'noNoNO'!
343 343 [255]
344 344
345 345 Test (non-)escaping of remote paths with spaces when cloning (issue3145):
346 346
347 $ hg clone --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
347 $ hg clone --ssh dummyssh "ssh://user@dummy/a repo"
348 348 destination directory: a repo
349 349 abort: destination 'a repo' is not empty
350 350 [255]
@@ -436,7 +436,7 b' stderr from remote commands should be pr'
436 436 > [paths]
437 437 > default-push = ssh://user@dummy/remote
438 438 > [ui]
439 > ssh = python "$TESTDIR/dummyssh"
439 > ssh = dummyssh
440 440 > [extensions]
441 441 > localwrite = localwrite.py
442 442 > EOF
@@ -457,7 +457,7 b' debug output'
457 457
458 458 $ hg pull --debug ssh://user@dummy/remote
459 459 pulling from ssh://user@dummy/remote
460 running python "*/dummyssh" user@dummy 'hg -R remote serve --stdio' (glob)
460 running dummyssh user@dummy 'hg -R remote serve --stdio'
461 461 sending hello command
462 462 sending between command
463 463 remote: 286
@@ -17,7 +17,7 b" creating 'remote' repo"
17 17 clone remote via stream
18 18
19 19 $ for i in 0 1 2 3 4 5 6 7 8; do
20 > hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed -r "$i" ssh://user@dummy/remote test-"$i"
20 > hg clone -e dummyssh --uncompressed -r "$i" ssh://user@dummy/remote test-"$i"
21 21 > if cd test-"$i"; then
22 22 > hg verify
23 23 > cd ..
@@ -139,7 +139,7 b' clone remote via stream'
139 139 4 files, 9 changesets, 7 total revisions
140 140 $ cd ..
141 141 $ cd test-1
142 $ hg pull -e "python \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote
142 $ hg pull -e dummyssh -r 4 ssh://user@dummy/remote
143 143 pulling from ssh://user@dummy/remote
144 144 searching for changes
145 145 adding changesets
@@ -153,7 +153,7 b' clone remote via stream'
153 153 crosschecking files in changesets and manifests
154 154 checking files
155 155 1 files, 3 changesets, 2 total revisions
156 $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
156 $ hg pull -e dummyssh ssh://user@dummy/remote
157 157 pulling from ssh://user@dummy/remote
158 158 searching for changes
159 159 adding changesets
@@ -163,7 +163,7 b' clone remote via stream'
163 163 (run 'hg update' to get a working copy)
164 164 $ cd ..
165 165 $ cd test-2
166 $ hg pull -e "python \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote
166 $ hg pull -e dummyssh -r 5 ssh://user@dummy/remote
167 167 pulling from ssh://user@dummy/remote
168 168 searching for changes
169 169 adding changesets
@@ -177,7 +177,7 b' clone remote via stream'
177 177 crosschecking files in changesets and manifests
178 178 checking files
179 179 1 files, 5 changesets, 3 total revisions
180 $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
180 $ hg pull -e dummyssh ssh://user@dummy/remote
181 181 pulling from ssh://user@dummy/remote
182 182 searching for changes
183 183 adding changesets
@@ -33,21 +33,21 b' configure for serving'
33 33
34 34 repo not found error
35 35
36 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local
36 $ hg clone -e dummyssh ssh://user@dummy/nonexistent local
37 37 remote: abort: there is no Mercurial repository here (.hg not found)!
38 38 abort: no suitable response from remote hg!
39 39 [255]
40 40
41 41 non-existent absolute path
42 42
43 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local
43 $ hg clone -e dummyssh ssh://user@dummy//`pwd`/nonexistent local
44 44 remote: abort: there is no Mercurial repository here (.hg not found)!
45 45 abort: no suitable response from remote hg!
46 46 [255]
47 47
48 48 clone remote via stream
49 49
50 $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream
50 $ hg clone -e dummyssh --uncompressed ssh://user@dummy/remote local-stream
51 51 streaming all changes
52 52 4 files to transfer, 615 bytes of data
53 53 transferred 615 bytes in * seconds (*) (glob)
@@ -69,7 +69,7 b' clone remote via stream'
69 69 clone bookmarks via stream
70 70
71 71 $ hg -R local-stream book mybook
72 $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2
72 $ hg clone -e dummyssh --uncompressed ssh://user@dummy/local-stream stream2
73 73 streaming all changes
74 74 4 files to transfer, 615 bytes of data
75 75 transferred 615 bytes in * seconds (*) (glob)
@@ -85,7 +85,7 b' clone bookmarks via stream'
85 85
86 86 clone remote via pull
87 87
88 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
88 $ hg clone -e dummyssh ssh://user@dummy/remote local
89 89 requesting all changes
90 90 adding changesets
91 91 adding manifests
@@ -110,14 +110,14 b' empty default pull'
110 110
111 111 $ hg paths
112 112 default = ssh://user@dummy/remote
113 $ hg pull -e "python \"$TESTDIR/dummyssh\""
113 $ hg pull -e dummyssh
114 114 pulling from ssh://user@dummy/remote
115 115 searching for changes
116 116 no changes found
117 117
118 118 pull from wrong ssh URL
119 119
120 $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist
120 $ hg pull -e dummyssh ssh://user@dummy/doesnotexist
121 121 pulling from ssh://user@dummy/doesnotexist
122 122 remote: abort: there is no Mercurial repository here (.hg not found)!
123 123 abort: no suitable response from remote hg!
@@ -132,7 +132,7 b' updating rc'
132 132
133 133 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
134 134 $ echo "[ui]" >> .hg/hgrc
135 $ echo "ssh = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc
135 $ echo "ssh = dummyssh" >> .hg/hgrc
136 136
137 137 find outgoing
138 138
@@ -149,7 +149,7 b' find outgoing'
149 149
150 150 find incoming on the remote side
151 151
152 $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local
152 $ hg incoming -R ../remote -e dummyssh ssh://user@dummy/local
153 153 comparing with ssh://user@dummy/local
154 154 searching for changes
155 155 changeset: 3:a28a9d1a809c
@@ -162,7 +162,7 b' find incoming on the remote side'
162 162
163 163 find incoming on the remote side (using absolute path)
164 164
165 $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`"
165 $ hg incoming -R ../remote -e dummyssh "ssh://user@dummy/`pwd`"
166 166 comparing with ssh://user@dummy/$TESTTMP/local
167 167 searching for changes
168 168 changeset: 3:a28a9d1a809c
@@ -209,7 +209,7 b' check remote tip'
209 209 test pushkeys and bookmarks
210 210
211 211 $ cd ../local
212 $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces
212 $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote namespaces
213 213 bookmarks
214 214 namespaces
215 215 phases
@@ -224,7 +224,7 b' test pushkeys and bookmarks'
224 224 no changes found
225 225 exporting bookmark foo
226 226 [1]
227 $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks
227 $ hg debugpushkey --config ui.ssh=dummyssh ssh://user@dummy/remote bookmarks
228 228 foo 1160648e36cec0054048a7edc4110c6f84fde594
229 229 $ hg book -f foo
230 230 $ hg push --traceback
@@ -294,7 +294,7 b' clone bookmarks'
294 294 $ hg -R ../remote bookmark test
295 295 $ hg -R ../remote bookmarks
296 296 * test 4:6c0482d977a3
297 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks
297 $ hg clone -e dummyssh ssh://user@dummy/remote local-bookmarks
298 298 requesting all changes
299 299 adding changesets
300 300 adding manifests
@@ -321,21 +321,21 b' hide outer repo'
321 321
322 322 Test remote paths with spaces (issue2983):
323 323
324 $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
324 $ hg init --ssh dummyssh "ssh://user@dummy/a repo"
325 325 $ touch "$TESTTMP/a repo/test"
326 326 $ hg -R 'a repo' commit -A -m "test"
327 327 adding test
328 328 $ hg -R 'a repo' tag tag
329 $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
329 $ hg id --ssh dummyssh "ssh://user@dummy/a repo"
330 330 73649e48688a
331 331
332 $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO"
332 $ hg id --ssh dummyssh "ssh://user@dummy/a repo#noNoNO"
333 333 abort: unknown revision 'noNoNO'!
334 334 [255]
335 335
336 336 Test (non-)escaping of remote paths with spaces when cloning (issue3145):
337 337
338 $ hg clone --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
338 $ hg clone --ssh dummyssh "ssh://user@dummy/a repo"
339 339 destination directory: a repo
340 340 abort: destination 'a repo' is not empty
341 341 [255]
@@ -424,7 +424,7 b' stderr from remote commands should be pr'
424 424 > [paths]
425 425 > default-push = ssh://user@dummy/remote
426 426 > [ui]
427 > ssh = python "$TESTDIR/dummyssh"
427 > ssh = dummyssh
428 428 > [extensions]
429 429 > localwrite = localwrite.py
430 430 > EOF
@@ -445,7 +445,7 b' debug output'
445 445
446 446 $ hg pull --debug ssh://user@dummy/remote
447 447 pulling from ssh://user@dummy/remote
448 running python "*/dummyssh" user@dummy 'hg -R remote serve --stdio' (glob)
448 running dummyssh user@dummy 'hg -R remote serve --stdio'
449 449 sending hello command
450 450 sending between command
451 451 remote: 286
@@ -74,7 +74,7 b" subrepo debug for 'main' clone"
74 74
75 75 subrepo paths with ssh urls
76 76
77 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone
77 $ hg clone -e dummyssh ssh://user@dummy/cloned sshclone
78 78 requesting all changes
79 79 adding changesets
80 80 adding manifests
@@ -89,7 +89,7 b' subrepo paths with ssh urls'
89 89 added 1 changesets with 1 changes to 1 files
90 90 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
91 91
92 $ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned
92 $ hg -R sshclone push -e dummyssh ssh://user@dummy/`pwd`/cloned
93 93 pushing to ssh://user@dummy/$TESTTMP/cloned
94 94 pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub
95 95 searching for changes
General Comments 0
You need to be logged in to leave comments. Login now