##// END OF EJS Templates
tests: manual cleanup now that dummyssh usage is implied...
Valentin Gatien-Baron -
r48733:0c92cd92 default
parent child Browse files
Show More
@@ -14,7 +14,6 b' setupcommon() {'
14 cat >> $HGRCPATH << EOF
14 cat >> $HGRCPATH << EOF
15 [extensions]
15 [extensions]
16 infinitepush=
16 infinitepush=
17 [ui]
18 [infinitepush]
17 [infinitepush]
19 branchpattern=re:scratch/.*
18 branchpattern=re:scratch/.*
20 EOF
19 EOF
@@ -1,7 +1,6 b''
1 cat >> $HGRCPATH <<EOF
1 cat >> $HGRCPATH <<EOF
2 [extensions]
2 [extensions]
3 narrow=
3 narrow=
4 [ui]
5 [experimental]
4 [experimental]
6 changegroup3 = True
5 changegroup3 = True
7 EOF
6 EOF
@@ -7,7 +7,6 b' debug=True'
7 remotefilelog=
7 remotefilelog=
8 rebase=
8 rebase=
9 strip=
9 strip=
10 [ui]
11 [server]
10 [server]
12 preferuncompressed=True
11 preferuncompressed=True
13 [experimental]
12 [experimental]
@@ -16,7 +16,6 b' global setup'
16 ------------
16 ------------
17
17
18 $ cat >> $HGRCPATH << EOF
18 $ cat >> $HGRCPATH << EOF
19 > [ui]
20 > [server]
19 > [server]
21 > concurrent-push-mode=check-related
20 > concurrent-push-mode=check-related
22 > EOF
21 > EOF
@@ -1142,7 +1142,6 b' Check hook preventing push (issue4455)'
1142 > local=../issue4455-dest/
1142 > local=../issue4455-dest/
1143 > ssh=ssh://user@dummy/issue4455-dest
1143 > ssh=ssh://user@dummy/issue4455-dest
1144 > http=http://localhost:$HGPORT/
1144 > http=http://localhost:$HGPORT/
1145 > [ui]
1146 > EOF
1145 > EOF
1147 $ cat >> ../issue4455-dest/.hg/hgrc << EOF
1146 $ cat >> ../issue4455-dest/.hg/hgrc << EOF
1148 > [hooks]
1147 > [hooks]
@@ -28,7 +28,6 b' enable obsolescence'
28 > evolution.createmarkers=True
28 > evolution.createmarkers=True
29 > evolution.exchange=True
29 > evolution.exchange=True
30 > bundle2-output-capture=True
30 > bundle2-output-capture=True
31 > [ui]
32 > [command-templates]
31 > [command-templates]
33 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
32 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
34 > [web]
33 > [web]
@@ -921,9 +920,6 b' Check abort from mandatory pushkey'
921
920
922 Test lazily acquiring the lock during unbundle
921 Test lazily acquiring the lock during unbundle
923 $ cp $TESTTMP/hgrc.orig $HGRCPATH
922 $ cp $TESTTMP/hgrc.orig $HGRCPATH
924 $ cat >> $HGRCPATH <<EOF
925 > [ui]
926 > EOF
927
923
928 $ cat >> $TESTTMP/locktester.py <<EOF
924 $ cat >> $TESTTMP/locktester.py <<EOF
929 > import os
925 > import os
@@ -233,7 +233,6 b' Create an extension to test bundle2 API'
233 > bundle2=$TESTTMP/bundle2.py
233 > bundle2=$TESTTMP/bundle2.py
234 > [experimental]
234 > [experimental]
235 > evolution.createmarkers=True
235 > evolution.createmarkers=True
236 > [ui]
237 > [command-templates]
236 > [command-templates]
238 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
237 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
239 > [web]
238 > [web]
@@ -94,7 +94,6 b' Start a simple HTTP server to serve bund'
94 $ cat dumb.pid >> $DAEMON_PIDS
94 $ cat dumb.pid >> $DAEMON_PIDS
95
95
96 $ cat >> $HGRCPATH << EOF
96 $ cat >> $HGRCPATH << EOF
97 > [ui]
98 > [command-templates]
97 > [command-templates]
99 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
98 > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
100 > EOF
99 > EOF
@@ -1,5 +1,4 b''
1 $ cat >> $HGRCPATH << EOF
1 $ cat >> $HGRCPATH << EOF
2 > [ui]
3 > [extensions]
2 > [extensions]
4 > fastannotate=
3 > fastannotate=
5 > [fastannotate]
4 > [fastannotate]
@@ -9,7 +9,6 b' Setup'
9
9
10 $ . "$TESTDIR/library-infinitepush.sh"
10 $ . "$TESTDIR/library-infinitepush.sh"
11 $ cat >> $HGRCPATH <<EOF
11 $ cat >> $HGRCPATH <<EOF
12 > [ui]
13 > [alias]
12 > [alias]
14 > glog = log -GT "{rev}:{node|short} {desc}\n{phase}"
13 > glog = log -GT "{rev}:{node|short} {desc}\n{phase}"
15 > EOF
14 > EOF
@@ -2516,8 +2516,7 b' New namespace is registered per repo ins'
2516 is global. So we shouldn't expect the namespace always exists. Using
2516 is global. So we shouldn't expect the namespace always exists. Using
2517 ssh:// makes sure a bundle repository is created from scratch. (issue6301)
2517 ssh:// makes sure a bundle repository is created from scratch. (issue6301)
2518
2518
2519 $ hg clone \
2519 $ hg clone -qr0 "ssh://user@dummy/`pwd`/a" a-clone
2520 > -qr0 "ssh://user@dummy/`pwd`/a" a-clone
2521 $ hg incoming --config extensions.names=names.py -R a-clone \
2520 $ hg incoming --config extensions.names=names.py -R a-clone \
2522 > -T '{bars}\n' -l1
2521 > -T '{bars}\n' -l1
2523 comparing with ssh://user@dummy/$TESTTMP/a
2522 comparing with ssh://user@dummy/$TESTTMP/a
@@ -2,7 +2,6 b' Testing the functionality to pull remote'
2 =============================================
2 =============================================
3
3
4 $ cat >> $HGRCPATH << EOF
4 $ cat >> $HGRCPATH << EOF
5 > [ui]
6 > [alias]
5 > [alias]
7 > glog = log -G -T '{rev}:{node|short} {desc}'
6 > glog = log -G -T '{rev}:{node|short} {desc}'
8 > [extensions]
7 > [extensions]
@@ -24,9 +24,6 b" some capability (because it's running an"
24 > [extensions]
24 > [extensions]
25 > disable-lookup = $TESTTMP/disable-lookup.py
25 > disable-lookup = $TESTTMP/disable-lookup.py
26 > EOF
26 > EOF
27 $ cat >> .hg/hgrc <<EOF
28 > [ui]
29 > EOF
30
27
31 $ hg pull ssh://user@dummy/repo1 -r tip -B a
28 $ hg pull ssh://user@dummy/repo1 -r tip -B a
32 pulling from ssh://user@dummy/repo1
29 pulling from ssh://user@dummy/repo1
@@ -163,8 +163,6 b' local change'
163 updating rc
163 updating rc
164
164
165 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
165 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
166 $ echo "[ui]" >> .hg/hgrc
167 $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc
168
166
169 find outgoing
167 find outgoing
170
168
@@ -462,7 +460,6 b' stderr from remote commands should be pr'
462 $ cat >> .hg/hgrc << EOF
460 $ cat >> .hg/hgrc << EOF
463 > [paths]
461 > [paths]
464 > default-push = ssh://user@dummy/remote
462 > default-push = ssh://user@dummy/remote
465 > [ui]
466 > [extensions]
463 > [extensions]
467 > localwrite = localwrite.py
464 > localwrite = localwrite.py
468 > EOF
465 > EOF
@@ -28,7 +28,6 b' protocols with inline conditional output'
28 > }
28 > }
29
29
30 $ cat >> $HGRCPATH << EOF
30 $ cat >> $HGRCPATH << EOF
31 > [ui]
32 > [devel]
31 > [devel]
33 > debug.peer-request = true
32 > debug.peer-request = true
34 > [extensions]
33 > [extensions]
@@ -4,12 +4,6 b' XXX-RHG this test hangs if `hg` is reall'
4 `alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed
4 `alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed
5 buggy. This need to be resolved sooner than later.
5 buggy. This need to be resolved sooner than later.
6
6
7 initial setup
8
9 $ cat << EOF >> $HGRCPATH
10 > [ui]
11 > EOF
12
13 repository itself is non-readable
7 repository itself is non-readable
14 ---------------------------------
8 ---------------------------------
15
9
@@ -149,8 +149,6 b' local change'
149 updating rc
149 updating rc
150
150
151 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
151 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
152 $ echo "[ui]" >> .hg/hgrc
153 $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc
154
152
155 find outgoing
153 find outgoing
156
154
@@ -515,7 +513,6 b' stderr from remote commands should be pr'
515 $ cat >> .hg/hgrc << EOF
513 $ cat >> .hg/hgrc << EOF
516 > [paths]
514 > [paths]
517 > default-push = ssh://user@dummy/remote
515 > default-push = ssh://user@dummy/remote
518 > [ui]
519 > [extensions]
516 > [extensions]
520 > localwrite = localwrite.py
517 > localwrite = localwrite.py
521 > EOF
518 > EOF
@@ -1,7 +1,3 b''
1 $ cat << EOF >> $HGRCPATH
2 > [ui]
3 > EOF
4
5 Set up repo
1 Set up repo
6
2
7 $ hg --config experimental.treemanifest=True init repo
3 $ hg --config experimental.treemanifest=True init repo
General Comments 0
You need to be logged in to leave comments. Login now