tests: cleanup binary test vector files
The test4012.png test vector file that was originally used for t4012 to check operations on binary files was later reused in other tests, making it no longer consistent to name it after a specific test. Rename it to more generic "test-binary-1.png". While at it, rename test9200b to "test-binary-2.png" (even though it is only used by t9200). Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vitaliy Ivanov committed
Jul 19, 2011 at 20:21 UTC
b5967f820c9774285ec4380e77d5356c3cd6eb99
8 files changed
+13
-13
t/t3307-notes-man.sh
+3
-3
@@ -26,13 +26,13 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
26
'
27
28
test_expect_success 'example 2: binary notes' '
29
- cp "$TEST_DIRECTORY"/test4012.png . &&
29
+ cp "$TEST_DIRECTORY"/test-binary-1.png . &&
30
git checkout B &&
31
- blob=$(git hash-object -w test4012.png) &&
31
+ blob=$(git hash-object -w test-binary-1.png) &&
32
git notes --ref=logo add -C "$blob" &&
33
git notes --ref=logo copy B C &&
34
git notes --ref=logo show C >actual &&
35
- test_cmp test4012.png actual
35
+ test_cmp test-binary-1.png actual
36
'
37
38
test_done
t/t4012-diff-binary.sh
+1
-1
@@ -12,7 +12,7 @@ test_expect_success 'prepare repository' \
12
'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
13
git update-index --add a b c d &&
14
echo git >a &&
15
- cat "$TEST_DIRECTORY"/test4012.png >b &&
15
+ cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
16
echo git >c &&
17
cat b b >d'
18
t/t6023-merge-file.sh
+1
-1
@@ -154,7 +154,7 @@ test_expect_success "expected conflict markers" "test_cmp expect out"
154
155
test_expect_success 'binary files cannot be merged' '
156
test_must_fail git merge-file -p \
157
- orig.txt "$TEST_DIRECTORY"/test4012.png new1.txt 2> merge.err &&
157
+ orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
158
grep "Cannot merge binary files" merge.err
159
'
160
t/t6027-merge-binary.sh
+1
-1
@@ -6,7 +6,7 @@ test_description='ask merge-recursive to merge binary files'
6
7
test_expect_success setup '
8
9
- cat "$TEST_DIRECTORY"/test4012.png >m &&
9
+ cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
10
git add m &&
11
git ls-files -s | sed -e "s/ 0 / 1 /" >E1 &&
12
test_tick &&
t/t9200-git-cvsexportcommit.sh
+7
-7
@@ -50,8 +50,8 @@ test_expect_success \
50
'mkdir A B C D E F &&
51
echo hello1 >A/newfile1.txt &&
52
echo hello2 >B/newfile2.txt &&
53
- cp "$TEST_DIRECTORY"/test9200a.png C/newfile3.png &&
54
- cp "$TEST_DIRECTORY"/test9200a.png D/newfile4.png &&
53
+ cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
54
+ cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
55
git add A/newfile1.txt &&
56
git add B/newfile2.txt &&
57
git add C/newfile3.png &&
@@ -76,8 +76,8 @@ test_expect_success \
76
rm -f B/newfile2.txt &&
77
rm -f C/newfile3.png &&
78
echo Hello5 >E/newfile5.txt &&
79
- cp "$TEST_DIRECTORY"/test9200b.png D/newfile4.png &&
80
- cp "$TEST_DIRECTORY"/test9200a.png F/newfile6.png &&
79
+ cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
80
+ cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
81
git add E/newfile5.txt &&
82
git add F/newfile6.png &&
83
git commit -a -m "Test: Remove, add and update" &&
@@ -165,7 +165,7 @@ test_expect_success \
165
'mkdir "G g" &&
166
echo ok then >"G g/with spaces.txt" &&
167
git add "G g/with spaces.txt" && \
168
- cp "$TEST_DIRECTORY"/test9200a.png "G g/with spaces.png" && \
168
+ cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
169
git add "G g/with spaces.png" &&
170
git commit -a -m "With spaces" &&
171
id=$(git rev-list --max-count=1 HEAD) &&
@@ -177,7 +177,7 @@ test_expect_success \
177
test_expect_success \
178
'Update file with spaces in file name' \
179
'echo Ok then >>"G g/with spaces.txt" &&
180
- cat "$TEST_DIRECTORY"/test9200a.png >>"G g/with spaces.png" && \
180
+ cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
181
git add "G g/with spaces.png" &&
182
git commit -a -m "Update with spaces" &&
183
id=$(git rev-list --max-count=1 HEAD) &&
@@ -202,7 +202,7 @@ test_expect_success \
202
'mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
203
echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
204
git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
205
- cp "$TEST_DIRECTORY"/test9200a.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
205
+ cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
206
git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
207
git commit -a -m "Går det så går det" && \
208
id=$(git rev-list --max-count=1 HEAD) &&
t/test-binary-1.png
renamed
t/test-binary-2.png
renamed
t/test9200a.png
Binary files a/t/test9200a.png and /dev/null differ