Junio C Hamano <gitster@xxxxxxxxx> writes: > Matthew DeVore <matvore@xxxxxxxxxx> writes: > >> Here is a re-roll-up since I haven't received any additional corrections for >> almost a week. > > Sorry, but doesn't this topic already sit in 'next'? If so, please make > these small clean-ups as incremental patches. Here is what I'd queue for now, with forged s-o-by from you ;-). Thanks. -- >8 -- From: Matthew DeVore <matvore@xxxxxxxxxx> Date: Fri, 12 Oct 2018 13:01:41 -0700 Subject: [PATCH] filter-trees: code clean-up of tests A few trivial updates to test to match the current best practices. - avoid "grep -q" that strips potentially useful output from running tests under "-v". - use test_write_lines to prepare multi-line expected output file - reserve use of test_must_fail to "git" commands. Signed-off-by: Matthew DeVore <matvore@xxxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- t/t5317-pack-objects-filter-objects.sh | 2 +- t/t5616-partial-clone.sh | 2 +- t/t6112-rev-list-filters-objects.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh index 510d3537f6..d9dccf4d4d 100755 --- a/t/t5317-pack-objects-filter-objects.sh +++ b/t/t5317-pack-objects-filter-objects.sh @@ -69,7 +69,7 @@ test_expect_success 'get an error for missing tree object' ' test_must_fail git -C r5 pack-objects --rev --stdout 2>bad_tree <<-EOF && HEAD EOF - grep -q "bad tree object" bad_tree + grep "bad tree object" bad_tree ' test_expect_success 'setup for tests of tree:0' ' diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 53fbf7db88..392caa08fd 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -192,7 +192,7 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr xargs -n1 git -C dst cat-file -t >fetched_types && sort -u fetched_types >unique_types.observed && - printf "blob\ncommit\ntree\n" >unique_types.expected && + test_write_lines blob commit tree >unique_types.expected && test_cmp unique_types.expected unique_types.observed ' diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh index 2cbb81d3bb..d24f9d5b5a 100755 --- a/t/t6112-rev-list-filters-objects.sh +++ b/t/t6112-rev-list-filters-objects.sh @@ -38,8 +38,8 @@ test_expect_success 'specify blob explicitly prevents filtering' ' awk -f print_2.awk) && git -C r1 rev-list --objects --filter=blob:none HEAD $file_3 >observed && - grep -q "$file_3" observed && - test_must_fail grep -q "$file_4" observed + grep "$file_3" observed && + ! grep "$file_4" observed ' test_expect_success 'verify emitted+omitted == all' ' @@ -241,7 +241,7 @@ test_expect_success 'verify tree:0 includes trees in "filtered" output' ' xargs -n1 git -C r3 cat-file -t >unsorted_filtered_types && sort -u unsorted_filtered_types >filtered_types && - printf "blob\ntree\n" >expected && + test_write_lines blob tree >expected && test_cmp expected filtered_types ' -- 2.19.1-328-g5a0cc8aca7
