##// END OF EJS Templates
tests: setup dummyssh as the default ssh...
Valentin Gatien-Baron -
r48731:a28a7dcb default
parent child Browse files
Show More
@@ -1554,6 +1554,8 b' class Test(unittest.TestCase):'
1554 hgrc.write(b'merge = internal:merge\n')
1554 hgrc.write(b'merge = internal:merge\n')
1555 hgrc.write(b'mergemarkers = detailed\n')
1555 hgrc.write(b'mergemarkers = detailed\n')
1556 hgrc.write(b'promptecho = True\n')
1556 hgrc.write(b'promptecho = True\n')
1557 dummyssh = os.path.join(self._testdir, b'dummyssh')
1558 hgrc.write(b'ssh = "%s" "%s"\n' % (PYTHON, dummyssh))
1557 hgrc.write(b'timeout.warn=15\n')
1559 hgrc.write(b'timeout.warn=15\n')
1558 hgrc.write(b'[chgserver]\n')
1560 hgrc.write(b'[chgserver]\n')
1559 hgrc.write(b'idletimeout=60\n')
1561 hgrc.write(b'idletimeout=60\n')
@@ -15,6 +15,7 b' Create a repository:'
15 ui.merge=internal:merge
15 ui.merge=internal:merge
16 ui.mergemarkers=detailed
16 ui.mergemarkers=detailed
17 ui.promptecho=True
17 ui.promptecho=True
18 ui.ssh=* (glob)
18 ui.timeout.warn=15
19 ui.timeout.warn=15
19 web.address=localhost
20 web.address=localhost
20 web\.ipv6=(?:True|False) (re)
21 web\.ipv6=(?:True|False) (re)
@@ -226,6 +226,7 b' check that local configs for the cached '
226 ui.detailed-exit-code=True
226 ui.detailed-exit-code=True
227 ui.merge=internal:merge
227 ui.merge=internal:merge
228 ui.mergemarkers=detailed
228 ui.mergemarkers=detailed
229 ui.ssh=* (glob)
229 ui.timeout.warn=15
230 ui.timeout.warn=15
230 ui.foo=bar
231 ui.foo=bar
231 ui.nontty=true
232 ui.nontty=true
@@ -239,6 +240,7 b' check that local configs for the cached '
239 ui.detailed-exit-code=True
240 ui.detailed-exit-code=True
240 ui.merge=internal:merge
241 ui.merge=internal:merge
241 ui.mergemarkers=detailed
242 ui.mergemarkers=detailed
243 ui.ssh=* (glob)
242 ui.timeout.warn=15
244 ui.timeout.warn=15
243 ui.nontty=true
245 ui.nontty=true
244 #endif
246 #endif
@@ -413,7 +413,7 b' Listing all config options'
413
413
414 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.
414 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.
415
415
416 $ hg config --exp-all-known | grep commit
416 $ hg config --exp-all-known | grep commit | grep -v ssh
417 commands.commit.interactive.git=False
417 commands.commit.interactive.git=False
418 commands.commit.interactive.ignoreblanklines=False
418 commands.commit.interactive.ignoreblanklines=False
419 commands.commit.interactive.ignorews=False
419 commands.commit.interactive.ignorews=False
@@ -486,7 +486,7 b' debug output'
486
486
487 $ hg pull --debug ssh://user@dummy/remote
487 $ hg pull --debug ssh://user@dummy/remote
488 pulling from ssh://user@dummy/remote
488 pulling from ssh://user@dummy/remote
489 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
489 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re)
490 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
490 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
491 sending hello command
491 sending hello command
492 sending between command
492 sending between command
@@ -28,7 +28,7 b" creating 'remote' repo"
28 clone remote via stream
28 clone remote via stream
29
29
30 $ for i in 0 1 2 3 4 5 6 7 8; do
30 $ for i in 0 1 2 3 4 5 6 7 8; do
31 > hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream -r "$i" ssh://user@dummy/remote test-"$i"
31 > hg clone --stream -r "$i" ssh://user@dummy/remote test-"$i"
32 > if cd test-"$i"; then
32 > if cd test-"$i"; then
33 > hg verify
33 > hg verify
34 > cd ..
34 > cd ..
@@ -160,7 +160,7 b' clone remote via stream'
160 checked 9 changesets with 7 changes to 4 files
160 checked 9 changesets with 7 changes to 4 files
161 $ cd ..
161 $ cd ..
162 $ cd test-1
162 $ cd test-1
163 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote
163 $ hg pull -r 4 ssh://user@dummy/remote
164 pulling from ssh://user@dummy/remote
164 pulling from ssh://user@dummy/remote
165 searching for changes
165 searching for changes
166 adding changesets
166 adding changesets
@@ -175,7 +175,7 b' clone remote via stream'
175 crosschecking files in changesets and manifests
175 crosschecking files in changesets and manifests
176 checking files
176 checking files
177 checked 3 changesets with 2 changes to 1 files
177 checked 3 changesets with 2 changes to 1 files
178 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
178 $ hg pull ssh://user@dummy/remote
179 pulling from ssh://user@dummy/remote
179 pulling from ssh://user@dummy/remote
180 searching for changes
180 searching for changes
181 adding changesets
181 adding changesets
@@ -186,7 +186,7 b' clone remote via stream'
186 (run 'hg update' to get a working copy)
186 (run 'hg update' to get a working copy)
187 $ cd ..
187 $ cd ..
188 $ cd test-2
188 $ cd test-2
189 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote
189 $ hg pull -r 5 ssh://user@dummy/remote
190 pulling from ssh://user@dummy/remote
190 pulling from ssh://user@dummy/remote
191 searching for changes
191 searching for changes
192 adding changesets
192 adding changesets
@@ -201,7 +201,7 b' clone remote via stream'
201 crosschecking files in changesets and manifests
201 crosschecking files in changesets and manifests
202 checking files
202 checking files
203 checked 5 changesets with 3 changes to 1 files
203 checked 5 changesets with 3 changes to 1 files
204 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
204 $ hg pull ssh://user@dummy/remote
205 pulling from ssh://user@dummy/remote
205 pulling from ssh://user@dummy/remote
206 searching for changes
206 searching for changes
207 adding changesets
207 adding changesets
@@ -540,7 +540,7 b' debug output'
540
540
541 $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
541 $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
542 pulling from ssh://user@dummy/remote
542 pulling from ssh://user@dummy/remote
543 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
543 running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re)
544 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
544 sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
545 devel-peer-request: hello+between
545 devel-peer-request: hello+between
546 devel-peer-request: pairs: 81 bytes
546 devel-peer-request: pairs: 81 bytes
General Comments 0
You need to be logged in to leave comments. Login now