t3420: remove progress lines before comparing output
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Thu, 4 Jul 2019 09:47:02 +0000 (02:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jul 2019 21:59:59 +0000 (14:59 -0700)
Some of the tests check the output of rebase is what we expect. These
were added after a regression that added unwanted stash output when
using --autostash. They are useful as they prevent unintended changes to
the output of the various rebase commands. However they also include all
the progress output which is less useful as it only tests what would be
written to a dumb terminal which is not the normal use case. The recent
changes to fix clearing the line when printing progress necessarily
meant making an ugly change to these tests. Address this my removing the
progress output before comparing it to the expected output. We do this
by removing everything before the final "\r" on each line as we don't
care about the progress indicator, but we do care about what is printed
immediately after it.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found