@matheusbsbs / matheus-bagliano / commits / 5555a2aa4b

t4201: make use of abbreviation in the test more robust

The test for '--abbrev' in t4201-shortlog.sh assumes that the commits generated in the test can always be uniquely abbreviated to 5 hex digits but this is not always the case. If you were unlucky and happened to run the test at (say) Thu Jun 22 03:04:49 2017 +0000, you would find that the first commit generated would collide with a tree object created later in the same test. This can be simulated in the version of t4201-shortlog.sh prior to this commit by setting GIT_COMMITTER_DATE and GIT_AUTHOR_DATE to 1498100689 after sourcing test-lib.sh. Change the test to test --abbrev=35 instead of --abbrev=5 to almost completely avoid the possibility of a partial collision and add a call to test_tick in the setup to make the test repeatable (the latter alone is sufficient to make it robust enough). Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Charles Bailey committed Nov 12, 2017 at 15:25 UTC 5555a2aa4bb004a24d8bea32051be0b56fb2532e

2 files changed +7 -5

t/t4201-shortlog.sh

+3 -2

@@ -9,6 +9,7 @@ test_description='git shortlog

9 . ./test-lib.sh

11 test_expect_success 'setup' '

12 + test_tick &&

13 echo 1 >a1 &&

14 git add a1 &&

15 tree=$(git write-tree) &&

@@ -59,7 +60,7 @@ fuzz() {

60 file=$1 &&

61 sed "

62 s/$_x40/OBJECT_NAME/g

62 - s/$_x05/OBJID/g

63 + s/$_x35/OBJID/g

64 s/^ \{6\}[CTa].*/ SUBJECT/g

65 s/^ \{8\}[^ ].*/ CONTINUATION/g

66 " <"$file" >"$file.fuzzy" &&

@@ -81,7 +82,7 @@ test_expect_success 'pretty format' '

83 test_expect_success '--abbrev' '

84 sed s/SUBJECT/OBJID/ expect.template >expect &&

84 - git shortlog --format="%h" --abbrev=5 HEAD >log &&

85 + git shortlog --format="%h" --abbrev=35 HEAD >log &&

86 fuzz log >log.predictable &&

87 test_cmp expect log.predictable

88 '

t/test-lib.sh

+4 -3

@@ -166,9 +166,10 @@ esac

166

167 # Convenience

168 #

169 -# A regexp to match 5 and 40 hexdigits

169 +# A regexp to match 5, 35 and 40 hexdigits

170 _x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'

171 -_x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05"

171 +_x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05"

172 +_x40="$_x35$_x05"

173

174 # Zero SHA-1

175 _z40=0000000000000000000000000000000000000000

@@ -184,7 +185,7 @@ LF='

185 # when case-folding filenames

186 u200c=$(printf '\342\200\214')

187

187 -export _x05 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB

188 +export _x05 _x35 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB

189

190 # Each test should start with something like this, after copyright notices:

191 #