remote-helpers: tests: general improvements
So that we don't need a temporary directory. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 24, 2013 at 21:29 UTC
531594e5aad738fa46cfad417bcef0fbd1520fbd
4 files changed
+31
-45
contrib/remote-helpers/test-bzr.sh
+10
-11
@@ -190,9 +190,11 @@ test_expect_success 'different authors' '
190
test_cmp expected actual
191
'
192
193
+# cleanup previous stuff
194
+rm -rf bzrrepo gitrepo
195
+
196
test_expect_success 'fetch utf-8 filenames' '
194
- mkdir -p tmp && cd tmp &&
195
- test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
197
+ test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C" &&
198
199
LC_ALL=en_US.UTF-8
200
export LC_ALL
@@ -223,8 +225,9 @@ test_expect_success 'fetch utf-8 filenames' '
225
'
226
227
test_expect_success 'push utf-8 filenames' '
228
+ test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C" &&
229
+
230
mkdir -p tmp && cd tmp &&
227
- test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
231
232
LC_ALL=en_US.UTF-8
233
export LC_ALL
@@ -255,8 +258,7 @@ test_expect_success 'push utf-8 filenames' '
258
'
259
260
test_expect_success 'pushing a merge' '
258
- mkdir -p tmp && cd tmp &&
259
- test_when_finished "cd .. && rm -rf tmp" &&
261
+ test_when_finished "rm -rf bzrrepo gitrepo" &&
262
263
(
264
bzr init bzrrepo &&
@@ -297,8 +299,7 @@ origin/trunk
299
EOF
300
301
test_expect_success 'proper bzr repo' '
300
- mkdir -p tmp && cd tmp &&
301
- test_when_finished "cd .. && rm -rf tmp" &&
302
+ test_when_finished "rm -rf bzrrepo gitrepo" &&
303
304
bzr init-repo bzrrepo &&
305
@@ -323,13 +324,11 @@ test_expect_success 'proper bzr repo' '
324
git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
325
) &&
326
326
- test_cmp ../expected actual
327
+ test_cmp expected actual
328
'
329
330
test_expect_success 'strip' '
330
- # Do not imitate this style; always chdir inside a subshell instead
331
- mkdir -p tmp && cd tmp &&
332
- test_when_finished "cd .. && rm -rf tmp" &&
331
+ test_when_finished "rm -rf bzrrepo gitrepo" &&
332
333
(
334
bzr init bzrrepo &&
contrib/remote-helpers/test-hg-bidi.sh
+5
-10
@@ -77,8 +77,7 @@ setup () {
77
setup
78
79
test_expect_success 'encoding' '
80
- mkdir -p tmp && cd tmp &&
81
- test_when_finished "cd .. && rm -rf tmp" &&
80
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
81
82
(
83
git init -q gitrepo &&
@@ -115,8 +114,7 @@ test_expect_success 'encoding' '
114
'
115
116
test_expect_success 'file removal' '
118
- mkdir -p tmp && cd tmp &&
119
- test_when_finished "cd .. && rm -rf tmp" &&
117
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
118
119
(
120
git init -q gitrepo &&
@@ -148,8 +146,7 @@ test_expect_success 'file removal' '
146
'
147
148
test_expect_success 'git tags' '
151
- mkdir -p tmp && cd tmp &&
152
- test_when_finished "cd .. && rm -rf tmp" &&
149
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
150
151
(
152
git init -q gitrepo &&
@@ -177,8 +174,7 @@ test_expect_success 'git tags' '
174
'
175
176
test_expect_success 'hg branch' '
180
- mkdir -p tmp && cd tmp &&
181
- test_when_finished "cd .. && rm -rf tmp" &&
177
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
178
179
(
180
git init -q gitrepo &&
@@ -214,8 +210,7 @@ test_expect_success 'hg branch' '
210
'
211
212
test_expect_success 'hg tags' '
217
- mkdir -p tmp && cd tmp &&
218
- test_when_finished "cd .. && rm -rf tmp" &&
213
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
214
215
(
216
git init -q gitrepo &&
contrib/remote-helpers/test-hg-hg-git.sh
+11
-22
@@ -115,8 +115,7 @@ setup () {
115
setup
116
117
test_expect_success 'executable bit' '
118
- mkdir -p tmp && cd tmp &&
119
- test_when_finished "cd .. && rm -rf tmp" &&
118
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
119
120
(
121
git init -q gitrepo &&
@@ -151,8 +150,7 @@ test_expect_success 'executable bit' '
150
'
151
152
test_expect_success 'symlink' '
154
- mkdir -p tmp && cd tmp &&
155
- test_when_finished "cd .. && rm -rf tmp" &&
153
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
154
155
(
156
git init -q gitrepo &&
@@ -182,8 +180,7 @@ test_expect_success 'symlink' '
180
'
181
182
test_expect_success 'merge conflict 1' '
185
- mkdir -p tmp && cd tmp &&
186
- test_when_finished "cd .. && rm -rf tmp" &&
183
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
184
185
(
186
hg init hgrepo1 &&
@@ -217,8 +214,7 @@ test_expect_success 'merge conflict 1' '
214
'
215
216
test_expect_success 'merge conflict 2' '
220
- mkdir -p tmp && cd tmp &&
221
- test_when_finished "cd .. && rm -rf tmp" &&
217
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
218
219
(
220
hg init hgrepo1 &&
@@ -252,8 +248,7 @@ test_expect_success 'merge conflict 2' '
248
'
249
250
test_expect_success 'converged merge' '
255
- mkdir -p tmp && cd tmp &&
256
- test_when_finished "cd .. && rm -rf tmp" &&
251
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
252
253
(
254
hg init hgrepo1 &&
@@ -288,8 +283,7 @@ test_expect_success 'converged merge' '
283
'
284
285
test_expect_success 'encoding' '
291
- mkdir -p tmp && cd tmp &&
292
- test_when_finished "cd .. && rm -rf tmp" &&
286
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
287
288
(
289
git init -q gitrepo &&
@@ -328,8 +322,7 @@ test_expect_success 'encoding' '
322
'
323
324
test_expect_success 'file removal' '
331
- mkdir -p tmp && cd tmp &&
332
- test_when_finished "cd .. && rm -rf tmp" &&
325
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
326
327
(
328
git init -q gitrepo &&
@@ -368,8 +361,7 @@ test_expect_success 'file removal' '
361
'
362
363
test_expect_success 'git tags' '
371
- mkdir -p tmp && cd tmp &&
372
- test_when_finished "cd .. && rm -rf tmp" &&
364
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
365
366
(
367
git init -q gitrepo &&
@@ -395,8 +387,7 @@ test_expect_success 'git tags' '
387
'
388
389
test_expect_success 'hg author' '
398
- mkdir -p tmp && cd tmp &&
399
- test_when_finished "cd .. && rm -rf tmp" &&
390
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
391
392
for x in hg git; do
393
(
@@ -462,8 +453,7 @@ test_expect_success 'hg author' '
453
'
454
455
test_expect_success 'hg branch' '
465
- mkdir -p tmp && cd tmp &&
466
- test_when_finished "cd .. && rm -rf tmp" &&
456
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
457
458
for x in hg git; do
459
(
@@ -499,8 +489,7 @@ test_expect_success 'hg branch' '
489
'
490
491
test_expect_success 'hg tags' '
502
- mkdir -p tmp && cd tmp &&
503
- test_when_finished "cd .. && rm -rf tmp" &&
492
+ test_when_finished "rm -rf gitrepo* hgrepo*" &&
493
494
for x in hg git; do
495
(
contrib/remote-helpers/test-hg.sh
+5
-2
@@ -122,6 +122,9 @@ test_expect_success 'update bookmark' '
122
hg -R hgrepo bookmarks | egrep "devel[ ]+3:"
123
'
124
125
+# cleanup previous stuff
126
+rm -rf hgrepo
127
+
128
author_test () {
129
echo $1 >> content &&
130
hg commit -u "$2" -m "add $1" &&
@@ -129,8 +132,7 @@ author_test () {
132
}
133
134
test_expect_success 'authors' '
132
- mkdir -p tmp && cd tmp &&
133
- test_when_finished "cd .. && rm -rf tmp" &&
135
+ test_when_finished "rm -rf hgrepo gitrepo" &&
136
137
(
138
hg init hgrepo &&
@@ -139,6 +141,7 @@ test_expect_success 'authors' '
141
touch content &&
142
hg add content &&
143
144
+ > ../expected &&
145
author_test alpha "" "H G Wells <wells@example.com>" &&
146
author_test beta "test" "test <unknown>" &&
147
author_test beta "test <test@example.com> (comment)" "test <test@example.com>" &&