Re: [PATCHv4 04/15] t4002 (diff-basic): use test_might_fail for commands that might fail

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Jonathan Nieder <jrnieder@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCHv4 04/15] t4002 (diff-basic): use test_might_fail for commands that might fail
Date: Fri, 1 Oct 2010 05:35:14 -0500	[thread overview]
Message-ID: <20101001103514.GC6816@burratino> (raw)
In-Reply-To: <1285542879-16381-5-git-send-email-newren@gmail.com>

Elijah Newren wrote:

> --- a/t/t4002-diff-basic.sh
> +++ b/t/t4002-diff-basic.sh
> @@ -205,8 +205,8 @@ test_expect_success \
>      'rm -fr Z [A-Z][A-Z] &&
>       git read-tree $tree_A &&
>       git checkout-index -f -a &&
> -     git read-tree --reset $tree_O || return 1
> -     git update-index --refresh >/dev/null ;# this can exit non-zero
> +     git read-tree --reset $tree_O &&
> +     test_might_fail git update-index --refresh >/dev/null &&
>       git diff-files >.test-a &&

Makes sense; thanks.  But aren't we actually guaranteed that it will
fail, since the index does not match the work tree?

Meanwhile, what was the point of refreshing the index like this?
I would guess it was to make sure that files that match the work tree
are marked as matching, but if so, this is not guaranteed if
update-index --refresh exits early.  Adding -q would fix that.

Why redirect to /dev/null?  I would think the extra output would
be useful while debugging with -v.
---
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 340aa7d..9fb8ca0 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -206,7 +206,7 @@ test_expect_success \
      git read-tree $tree_A &&
      git checkout-index -f -a &&
      git read-tree --reset $tree_O &&
-     test_might_fail git update-index --refresh >/dev/null &&
+     test_must_fail git update-index --refresh -q &&
      git diff-files >.test-a &&
      cmp_diff_files_output .test-a .test-recursive-OA'
 
@@ -216,7 +216,7 @@ test_expect_success \
      git read-tree $tree_B &&
      git checkout-index -f -a &&
      git read-tree --reset $tree_O &&
-     test_might_fail git update-index --refresh >/dev/null &&
+     test_must_fail git update-index --refresh -q &&
      git diff-files >.test-a &&
      cmp_diff_files_output .test-a .test-recursive-OB'
 
@@ -226,7 +226,7 @@ test_expect_success \
      git read-tree $tree_B &&
      git checkout-index -f -a &&
      git read-tree --reset $tree_A &&
-     test_might_fail git update-index --refresh >/dev/null &&
+     test_must_fail git update-index --refresh -q &&
      git diff-files >.test-a &&
      cmp_diff_files_output .test-a .test-recursive-AB'
 
--

next prev parent reply	other threads:[~2010-10-01 10:38 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-26 23:14 [PATCHv4 00/15] Add missing &&'s in the testsuite Elijah Newren
2010-09-26 23:14 ` [PATCHv4 01/15] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-26 23:14 ` [PATCHv4 02/15] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-29 18:07   ` Junio C Hamano
2010-09-29 18:45     ` Ævar Arnfjörð Bjarmason
2010-10-01 10:23       ` Jonathan Nieder
2010-10-01 10:38         ` Ævar Arnfjörð Bjarmason
2010-10-01 11:52           ` Jonathan Nieder
2010-10-01 16:20           ` Junio C Hamano
2010-10-01 17:16             ` [PATCH] test-lib: make test_expect_code a test command Ævar Arnfjörð Bjarmason
2010-10-01 17:39               ` Sverre Rabbelier
2010-10-01 17:46                 ` Ævar Arnfjörð Bjarmason
2010-10-01 17:47                   ` Sverre Rabbelier
2010-10-01 17:42               ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2010-10-01 18:55               ` [PATCH] " Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 03/15] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-29 18:28   ` Junio C Hamano
2010-10-01 10:27     ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 04/15] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-10-01 10:35   ` Jonathan Nieder [this message]
2010-09-26 23:14 ` [PATCHv4 05/15] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-26 23:14 ` [PATCHv4 06/15] t3600 (rm): add lots of missing && Elijah Newren
2010-10-01 10:48   ` Jonathan Nieder
2010-10-03  2:47     ` Elijah Newren
2010-09-26 23:14 ` [PATCHv4 07/15] t4019 (diff-wserror): " Elijah Newren
2010-09-29 19:01   ` Junio C Hamano
2010-10-03  3:03     ` Elijah Newren
2010-10-01 11:00   ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 08/15] t4026 (color): remove unneeded and unchained command Elijah Newren
2010-09-26 23:14 ` [PATCHv4 09/15] t5602 (clone-remote-exec): add missing && Elijah Newren
2010-09-29 19:09   ` Junio C Hamano
2010-10-01 11:34     ` Jonathan Nieder
2010-10-03  3:08       ` Elijah Newren
2010-09-26 23:14 ` [PATCHv4 10/15] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-27  0:10   ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 11/15] t7001 (mv): " Elijah Newren
2010-09-26 23:14 ` [PATCHv4 12/15] t7601 (merge-pull-config): " Elijah Newren
2010-09-26 23:14 ` [PATCHv4 13/15] t7800 (difftool): " Elijah Newren
2010-10-01 11:30   ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 14/15] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-29 19:37   ` Junio C Hamano
2010-10-01  0:48   ` Ævar Arnfjörð Bjarmason
2010-10-01 11:26   ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 15/15] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README Elijah Newren
2010-09-29 19:48   ` Junio C Hamano
2010-09-29 20:28     ` Ævar Arnfjörð Bjarmason
2010-09-29 20:30     ` Elijah Newren
2010-09-30 16:09       ` Junio C Hamano
2010-09-30 21:51         ` Elijah Newren
2010-10-01 11:45           ` Jonathan Nieder
2010-10-01 14:39             ` Sverre Rabbelier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:340aa7d dfblob:9fb8ca0 )
 OR (
bs:"Re: [PATCHv4 04/15] t4002 (diff-basic): use test_might_fail for commands that might fail" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101001103514.GC6816@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.