Skip to content

Commit b5967f8

Browse files
vitalivanovgitster
vitalivanov
authored and
gitster
committed
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>
1 parent d28790d commit b5967f8

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

‎t/t3307-notes-man.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
2626
'
2727

2828
test_expect_success 'example 2: binary notes' '
29-
cp "$TEST_DIRECTORY"/test4012.png . &&
29+
cp "$TEST_DIRECTORY"/test-binary-1.png . &&
3030
git checkout B &&
31-
blob=$(git hash-object -w test4012.png) &&
31+
blob=$(git hash-object -w test-binary-1.png) &&
3232
git notes --ref=logo add -C "$blob" &&
3333
git notes --ref=logo copy B C &&
3434
git notes --ref=logo show C >actual &&
35-
test_cmp test4012.png actual
35+
test_cmp test-binary-1.png actual
3636
'
3737

3838
test_done

‎t/t4012-diff-binary.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_expect_success 'prepare repository' \
1212
'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
1313
git update-index --add a b c d &&
1414
echo git >a &&
15-
cat "$TEST_DIRECTORY"/test4012.png >b &&
15+
cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
1616
echo git >c &&
1717
cat b b >d'
1818

‎t/t6023-merge-file.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ test_expect_success "expected conflict markers" "test_cmp expect out"
154154

155155
test_expect_success 'binary files cannot be merged' '
156156
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 &&
158158
grep "Cannot merge binary files" merge.err
159159
'
160160

‎t/t6027-merge-binary.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test_description='ask merge-recursive to merge binary files'
66

77
test_expect_success setup '
88
9-
cat "$TEST_DIRECTORY"/test4012.png >m &&
9+
cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
1010
git add m &&
1111
git ls-files -s | sed -e "s/ 0 / 1 /" >E1 &&
1212
test_tick &&

‎t/t9200-git-cvsexportcommit.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ test_expect_success \
5050
'mkdir A B C D E F &&
5151
echo hello1 >A/newfile1.txt &&
5252
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 &&
5555
git add A/newfile1.txt &&
5656
git add B/newfile2.txt &&
5757
git add C/newfile3.png &&
@@ -76,8 +76,8 @@ test_expect_success \
7676
rm -f B/newfile2.txt &&
7777
rm -f C/newfile3.png &&
7878
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 &&
8181
git add E/newfile5.txt &&
8282
git add F/newfile6.png &&
8383
git commit -a -m "Test: Remove, add and update" &&
@@ -165,7 +165,7 @@ test_expect_success \
165165
'mkdir "G g" &&
166166
echo ok then >"G g/with spaces.txt" &&
167167
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" && \
169169
git add "G g/with spaces.png" &&
170170
git commit -a -m "With spaces" &&
171171
id=$(git rev-list --max-count=1 HEAD) &&
@@ -177,7 +177,7 @@ test_expect_success \
177177
test_expect_success \
178178
'Update file with spaces in file name' \
179179
'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" && \
181181
git add "G g/with spaces.png" &&
182182
git commit -a -m "Update with spaces" &&
183183
id=$(git rev-list --max-count=1 HEAD) &&
@@ -202,7 +202,7 @@ test_expect_success \
202202
'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/å/ä/ö &&
203203
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 &&
204204
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 &&
206206
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 &&
207207
git commit -a -m "Går det så går det" && \
208208
id=$(git rev-list --max-count=1 HEAD) &&

t/test4012.png renamed to t/test-binary-1.png

File renamed without changes.

t/test9200b.png renamed to t/test-binary-2.png

File renamed without changes.

‎t/test9200a.png‎

-5.53 KB
Binary file not shown.

0 commit comments

Comments
 (0)