From: Elijah Newren <newren@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCHv4 06/15] t3600 (rm): add lots of missing &&
Date: Sat, 2 Oct 2010 20:47:31 -0600 [thread overview]
Message-ID: <AANLkTi=oyCFLYuBa6CPCC4PpDt6aPe1wXz98M_F+qary@mail.gmail.com> (raw)
In-Reply-To: <20101001104823.GD6816@burratino>
On Fri, Oct 1, 2010 at 4:48 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Elijah Newren wrote:
>
>> Also delete unnecessary, failing code and add some test_when_finished
>> calls to make sure tests clean up after themselves.
>
> I don't understand this one.
>
> If tests clean up after themselves, each will restore some pristine
> state as though (at least as far as the other tests care) it had never
> run at all, right?
>
>> --- a/t/t3600-rm.sh
>> +++ b/t/t3600-rm.sh
>> @@ -38,37 +38,33 @@ test_expect_success \
>>
>> test_expect_success \
>> 'Test that git rm --cached foo succeeds if the index matches the file' \
>> - 'echo content > foo
>> - git add foo
>> + 'echo content > foo &&
>> + git add foo &&
>> git rm --cached foo'
>
> Before this runs: foo is empty, absent from index.
> After it runs: foo has content, still absent from index.
> Requires: nothing.
>
>> test_expect_success \
>> 'Test that git rm --cached foo succeeds if the index matches the file' \
>> - 'echo content > foo
>> - git add foo
>> - git commit -m foo
>> - echo "other content" > foo
>> + 'echo content > foo &&
>> + git add foo &&
>> + git commit -m foo &&
>> + echo "other content" > foo &&
>> + test_when_finished "git checkout HEAD -- foo" &&
>> git rm --cached foo'
>
> Before this runs: foo has content, absent from index.
> After this runs (without patch): foo has other content, absent from index.
> After this runs (with patch): foo has content, matching index.
> Requires: nothing.
>
>> test_expect_success \
>> 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
>> - echo content > foo
>> - git add foo
>> - git commit -m foo
>> - echo "other content" > foo
>> - git add foo
>> - echo "yet another content" > foo
>> + echo "other content" > foo &&
>> + git add foo &&
>> + echo "yet another content" > foo &&
>> + test_when_finished "git checkout HEAD -- foo" &&
>> test_must_fail git rm --cached foo
>> '
>
> Before this runs: see above.
> After this runs (without patch): foo has yet another content, absent from index.
> After this runs (with patch): foo has content, matching index.
> Requires (without patch): nothing.
> Requires (with patch): HEAD:foo is content.
>
> [etc]
>
> So if I understand correctly, this sacrifices the ability to
> skip individual tests. What does one gain in return?
Good eye. It does remove failing code and add correct && chaining,
but yes, it will fail if you skip sufficiently many individual tests.
I believe my original patch submission
(http://article.gmane.org/gmane.comp.version-control.git/157080) does
not suffer from this same problem. Should I revert to it?
Elijah
next prev parent reply other threads:[~2010-10-03 2:47 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
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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=oyCFLYuBa6CPCC4PpDt6aPe1wXz98M_F+qary@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).