t5515: make test hash independent
This test contains a large number of data files, mostly using the same object ID values for refs. Instead of producing two separate sets of test files, keep the test files using SHA-1 and translate them on the fly by replacing the SHA-1 values with the values for the current hash algorithm in use. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Feb 7, 2020 at 00:52 UTC
f7ae8e69b6540d6ec20208506b319a65161d4933
1 file changed
+54
-5
t/t5515-fetch-merge-logic.sh
+54
-5
@@ -12,11 +12,55 @@ GIT_TEST_PROTOCOL_VERSION=
12
13
. ./test-lib.sh
14
15
+build_script () {
16
+ script="$1" &&
17
+ for i in one three_file master master2 one_tree three two two2 three2
18
+ do
19
+ echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script"
20
+ done
21
+}
22
+
23
+convert_expected () {
24
+ file="$1" &&
25
+ script="$2" &&
26
+ sed -f "$script" "$file" >"$file.tmp" &&
27
+ mv "$file.tmp" "$file"
28
+}
29
+
30
test_expect_success setup '
31
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
32
GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
33
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
34
35
+ test_oid_cache <<-EOF &&
36
+ one sha1:8e32a6d901327a23ef831511badce7bf3bf46689
37
+ one sha256:8739546433ab1ac72ee93088dce611210effee072b2b586ceac6dde43ebec9ce
38
+
39
+ three_file sha1:0e3b14047d3ee365f4f2a1b673db059c3972589c
40
+ three_file sha256:bc4447d50c07497a8bfe6eef817f2364ecca9d471452e43b52756cc1a908bd32
41
+
42
+ master sha1:6c9dec2b923228c9ff994c6cfe4ae16c12408dc5
43
+ master sha256:8521c3072461fcfe8f32d67f95cc6e6b832a2db2fa29769ffc788bce85ebcd75
44
+
45
+ one_tree sha1:22feea448b023a2d864ef94b013735af34d238ba
46
+ one_tree sha256:6e4743f4ef2356b881dda5e91f5c7cdffe870faf350bf7b312f80a20935f5d83
47
+
48
+ three sha1:c61a82b60967180544e3c19f819ddbd0c9f89899
49
+ three sha256:0cc6d1eda617ded715170786e31ba4e2d0185404ec5a3508dd0d73b324860c6a
50
+
51
+ two sha1:525b7fb068d59950d185a8779dc957c77eed73ba
52
+ two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db
53
+
54
+ master2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f
55
+ master2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0
56
+
57
+ two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
58
+ two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4
59
+
60
+ three2 sha1:0567da4d5edd2ff4bb292a465ba9e64dcad9536b
61
+ three2 sha256:cceb3e8eca364fa9a0a39a1efbebecacc664af86cbbd8070571f5faeb5f0e8c3
62
+ EOF
63
+
64
echo >file original &&
65
git add file &&
66
git commit -a -m One &&
@@ -86,7 +130,8 @@ test_expect_success setup '
130
git config branch.br-$remote-octopus.remote $remote &&
131
git config branch.br-$remote-octopus.merge refs/heads/one &&
132
git config --add branch.br-$remote-octopus.merge two
89
- done
133
+ done &&
134
+ build_script sed_script
135
'
136
137
# Merge logic depends on branch properties and Pull: or .fetch lines
@@ -137,6 +182,10 @@ do
182
actual_r="$pfx-refs.$test"
183
184
test_expect_success "$cmd" '
185
+ cp "$expect_f" expect_f &&
186
+ convert_expected expect_f sed_script &&
187
+ cp "$expect_r" expect_r &&
188
+ convert_expected expect_r sed_script &&
189
{
190
echo "# $cmd"
191
set x $cmd; shift
@@ -152,18 +201,18 @@ do
201
cat .git/FETCH_HEAD
202
} >"$actual_f" &&
203
git show-ref >"$actual_r" &&
155
- if test -f "$expect_f"
204
+ if test -f "expect_f"
205
then
157
- test_cmp "$expect_f" "$actual_f" &&
206
+ test_cmp "expect_f" "$actual_f" &&
207
rm -f "$actual_f"
208
else
209
# this is to help developing new tests.
210
cp "$actual_f" "$expect_f"
211
false
212
fi &&
164
- if test -f "$expect_r"
213
+ if test -f "expect_r"
214
then
166
- test_cmp "$expect_r" "$actual_r" &&
215
+ test_cmp "expect_r" "$actual_r" &&
216
rm -f "$actual_r"
217
else
218
# this is to help developing new tests.