@matheusbsbs / matheus-bagliano / commits / b7446fcfdf

t4150: fix broken test for am --scissors

Tests for "git am --[no-]scissors" [1] work in the following way: 1. Create files with commit messages 2. Use these files to create expected commits 3. Generate eml file with patch from expected commits 4. Create commits using git am with these eml files 5. Compare these commits with expected The test for "git am --scissors" is supposed to take an e-mail with a scissors line and in-body "Subject:" header and demonstrate that the subject line from the e-mail itself is overridden by the in-body header and that only text below the scissors line is included in the commit message of the commit created by the invocation of "git am --scissors". However, the setup of the test incorrectly uses a commit without the scissors line and without the in-body header in the commit message, producing eml file not suitable for testing of "git am --scissors". This can be checked by intentionally breaking is_scissors_line function in mailinfo.c, for example, by changing string ">8", which is used by the test. With such change the test should fail, but does not. Fix broken test by generating eml file with scissors line and in-body header "Subject:". Since the two tests for --scissors and --no-scissors options are there to test cutting or keeping the commit message, update both tests to change the test file in the same way, which allows us to generate only one eml file to be passed to git am. To clarify the intention of the test, give files and tags more explicit names. [1]: introduced in bf72ac17d (t4150: tests for am --[no-]scissors, 2015-07-19) Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Reviewed-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Andrei Rybak committed Aug 6, 2018 at 19:49 UTC b7446fcfdf4e275ebe6cece33edd19760bb2cb0b

1 file changed +20 -19

t/t4150-am.sh

+20 -19

@@ -69,13 +69,15 @@ test_expect_success 'setup: messages' '

70 EOF

72 - cat >scissors-msg <<-\EOF &&

73 - Test git-am with scissors line

72 + cat >msg-without-scissors-line <<-\EOF &&

73 + Test that git-am --scissors cuts at the scissors line

75 This line should be included in the commit message.

76 EOF

78 - cat - scissors-msg >no-scissors-msg <<-\EOF &&

78 + printf "Subject: " >subject-prefix &&

79 +

80 + cat - subject-prefix msg-without-scissors-line >msg-with-scissors-line <<-\EOF &&

81 This line should not be included in the commit message with --scissors enabled.

83 - - >8 - - remove everything above this line - - >8 - -

@@ -148,18 +150,17 @@ test_expect_success setup '

150 } >patch1-hg.eml &&

151

152

151 - echo scissors-file >scissors-file &&

152 - git add scissors-file &&

153 - git commit -F scissors-msg &&

154 - git tag scissors &&

155 - git format-patch --stdout scissors^ >scissors-patch.eml &&

153 + echo file >file &&

154 + git add file &&

155 + git commit -F msg-without-scissors-line &&

156 + git tag expected-for-scissors &&

157 git reset --hard HEAD^ &&

158

158 - echo no-scissors-file >no-scissors-file &&

159 - git add no-scissors-file &&

160 - git commit -F no-scissors-msg &&

161 - git tag no-scissors &&

162 - git format-patch --stdout no-scissors^ >no-scissors-patch.eml &&

159 + echo file >file &&

160 + git add file &&

161 + git commit -F msg-with-scissors-line &&

162 + git tag expected-for-no-scissors &&

163 + git format-patch --stdout expected-for-no-scissors^ >patch-with-scissors-line.eml &&

164 git reset --hard HEAD^ &&

165

166 sed -n -e "3,\$p" msg >file &&

@@ -416,10 +417,10 @@ test_expect_success 'am --scissors cuts the message at the scissors line' '

417 rm -fr .git/rebase-apply &&

418 git reset --hard &&

419 git checkout second &&

419 - git am --scissors scissors-patch.eml &&

420 + git am --scissors patch-with-scissors-line.eml &&

421 test_path_is_missing .git/rebase-apply &&

421 - git diff --exit-code scissors &&

422 - test_cmp_rev scissors HEAD

422 + git diff --exit-code expected-for-scissors &&

423 + test_cmp_rev expected-for-scissors HEAD

424 '

425

426 test_expect_success 'am --no-scissors overrides mailinfo.scissors' '

@@ -427,10 +428,10 @@ test_expect_success 'am --no-scissors overrides mailinfo.scissors' '

428 git reset --hard &&

429 git checkout second &&

430 test_config mailinfo.scissors true &&

430 - git am --no-scissors no-scissors-patch.eml &&

431 + git am --no-scissors patch-with-scissors-line.eml &&

432 test_path_is_missing .git/rebase-apply &&

432 - git diff --exit-code no-scissors &&

433 - test_cmp_rev no-scissors HEAD

433 + git diff --exit-code expected-for-no-scissors &&

434 + test_cmp_rev expected-for-no-scissors HEAD

435 '

436

437 test_expect_success 'setup: new author and committer' '