kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t3404: directly test the behavior of interest 

t3404.3 is a simple test added by commit d078c39106 ("t3404: todo list
with commented-out commands only aborts", 2018-08-10) which was designed
to test a todo list that only contained commented-out commands.  There
were two problems with this test: (1) its title did not reflect the
purpose of the test, and (2) it tested the desired behavior through a
side-effect of other functionality instead of directly testing the
desired behavior discussed in the commit message.

Modify the test to directly test the desired behavior and update the
test title.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2020-01-16 06:14:16 +00:00 committed by Junio C Hamano
parent 22a69fda19
commit a9ae8fde2e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t3404-rebase-interactive.sh
View File

@ -72,15 +72,16 @@ test_expect_success 'rebase --keep-empty' '
test_line_count = 6 actual test_line_count = 6 actual
' '


test_expect_success 'rebase -i with empty HEAD' ' test_expect_success 'rebase -i with empty todo list' '
cat >expect <<-\EOF && cat >expect <<-\EOF &&
error: nothing to do error: nothing to do
EOF EOF
( (
set_fake_editor && set_fake_editor &&
test_must_fail env FAKE_LINES="1 exec_true" \ test_must_fail env FAKE_LINES="#" \
git rebase -i HEAD^ >actual 2>&1 git rebase -i HEAD^ >output 2>&1
) && ) &&
tail -n 1 output >actual && # Ignore output about changing todo list
test_i18ncmp expect actual test_i18ncmp expect actual
' '