From: Stefan Beller <sbeller@google.com>
To: Richard Hansen <hansenr@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
David Aguilar <davvid@gmail.com>, Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH 2/4] t7610: make tests more independent and debuggable
Date: Wed, 4 Jan 2017 12:27:45 -0800 [thread overview]
Message-ID: <CAGZ79kb9UvV6AaRLBP5OzyRtTTXarRZRZDMd_1k5n9CrgbVr5A@mail.gmail.com> (raw)
In-Reply-To: <20170104005042.51530-3-hansenr@google.com>
On Tue, Jan 3, 2017 at 4:50 PM, Richard Hansen <hansenr@google.com> wrote:
> If a test fails it might leave the repository in a strange state. Add
> 'git reset --hard' at the beginning of each test to increase the odds
> of passing when an earlier test fails.
So each test is cleaning up the previous test, which *may* confuse
a reader ("how is the reset --hard relevant for this test? Oooh it's
just a cleanup").
We could put it another way by having each test itself make clean
up after itself via
test_when_finished "git reset --hard" &&
..
at the beginning of each test.
This would produce the same order of operations, i.e. a
reset run between each test, but semantically tells the reader
that the reset is part of the current test cleaning up after itself,
as "reset" is operation for this particular test to cleanup.
Does that make sense?
>
> Also use test-specific branches to avoid interfering with later tests
> and to make the tests easier to debug.
That sounds great!
Though in the code I only spot one occurrence for
+ git checkout -b test$test_count branch1 &&
so maybe that could be part of the first patch in the series?
Thanks,
Stefan
next prev parent reply other threads:[~2017-01-04 20:28 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 0:50 [PATCH 0/4] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-04 0:50 ` [PATCH 1/4] t7610: update branch names to match test number Richard Hansen
2017-01-04 0:50 ` [PATCH 2/4] t7610: make tests more independent and debuggable Richard Hansen
2017-01-04 20:27 ` Stefan Beller [this message]
2017-01-05 15:41 ` Richard Hansen
2017-01-05 15:46 ` Richard Hansen
2017-01-05 12:20 ` Simon Ruderich
2017-01-05 15:48 ` Richard Hansen
2017-01-04 0:50 ` [PATCH 3/4] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-04 0:50 ` [PATCH 4/4] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-06 1:09 ` [PATCH v2 0/4] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-06 1:09 ` [PATCH v2 1/4] t7610: update branch names to match test number Richard Hansen
2017-01-06 1:09 ` [PATCH v2 2/4] t7610: make tests more independent and debuggable Richard Hansen
2017-01-06 1:31 ` Stefan Beller
2017-01-07 1:53 ` Richard Hansen
2017-01-06 1:09 ` [PATCH v2 3/4] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-06 1:09 ` [PATCH v2 4/4] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-06 9:42 ` Johannes Sixt
2017-01-07 2:16 ` Richard Hansen
2017-01-09 5:42 ` [PATCH v3 00/13] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-09 5:42 ` [PATCH v3 01/13] .mailmap: Use my personal email address as my canonical Richard Hansen
2017-01-09 5:42 ` [PATCH v3 02/13] t7610: update branch names to match test number Richard Hansen
2017-01-09 5:42 ` [PATCH v3 03/13] t7610: Move setup code to the 'setup' test case Richard Hansen
2017-01-09 5:42 ` [PATCH v3 04/13] t7610: use test_when_finished for cleanup tasks Richard Hansen
2017-01-09 5:42 ` [PATCH v3 05/13] t7610: don't rely on state from previous test Richard Hansen
2017-01-09 5:42 ` [PATCH v3 06/13] t7610: run 'git reset --hard' after each test to clean up Richard Hansen
2017-01-09 5:42 ` [PATCH v3 07/13] t7610: delete some now-unnecessary 'git reset --hard' lines Richard Hansen
2017-01-09 5:42 ` [PATCH v3 08/13] t7610: always work on a test-specific branch Richard Hansen
2017-01-09 5:42 ` [PATCH v3 09/13] t7610: don't assume the checked-out commit Richard Hansen
2017-01-09 5:42 ` [PATCH v3 10/13] t7610: spell 'git reset --hard' consistently Richard Hansen
2017-01-09 5:42 ` [PATCH v3 11/13] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-09 5:42 ` [PATCH v3 12/13] mergetool: take the "-O" out of $orderfile Richard Hansen
2017-01-09 5:42 ` [PATCH v3 13/13] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-09 18:12 ` Junio C Hamano
2017-01-09 19:05 ` Junio C Hamano
2017-01-09 19:53 ` Johannes Sixt
2017-01-09 22:57 ` Richard Hansen
2017-01-09 23:29 ` Junio C Hamano
2017-01-09 23:32 ` Junio C Hamano
2017-01-09 23:50 ` Richard Hansen
2017-01-09 18:49 ` [PATCH v3 00/13] fix mergetool+rerere+subdir regression Stefan Beller
2017-01-09 23:29 ` [PATCH v4 00/14] " Richard Hansen
2017-01-09 23:29 ` [PATCH v4 01/14] .mailmap: Use my personal email address as my canonical Richard Hansen
2017-01-09 23:29 ` [PATCH v4 02/14] rev-parse doc: use "--" in the --prefix example Richard Hansen
2017-01-09 23:29 ` [PATCH v4 03/14] t7610: update branch names to match test number Richard Hansen
2017-01-09 23:29 ` [PATCH v4 04/14] t7610: Move setup code to the 'setup' test case Richard Hansen
2017-01-09 23:29 ` [PATCH v4 05/14] t7610: use test_when_finished for cleanup tasks Richard Hansen
2017-01-09 23:29 ` [PATCH v4 06/14] t7610: don't rely on state from previous test Richard Hansen
2017-01-09 23:29 ` [PATCH v4 07/14] t7610: run 'git reset --hard' after each test to clean up Richard Hansen
2017-01-09 23:29 ` [PATCH v4 08/14] t7610: delete some now-unnecessary 'git reset --hard' lines Richard Hansen
2017-01-09 23:29 ` [PATCH v4 09/14] t7610: always work on a test-specific branch Richard Hansen
2017-01-09 23:29 ` [PATCH v4 10/14] t7610: don't assume the checked-out commit Richard Hansen
2017-01-09 23:29 ` [PATCH v4 11/14] t7610: spell 'git reset --hard' consistently Richard Hansen
2017-01-09 23:29 ` [PATCH v4 12/14] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-09 23:29 ` [PATCH v4 13/14] mergetool: take the "-O" out of $orderfile Richard Hansen
2017-01-09 23:29 ` [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-10 6:17 ` Johannes Sixt
2017-01-10 17:09 ` Richard Hansen
2017-01-10 19:25 ` Junio C Hamano
2017-01-10 20:29 ` Johannes Sixt
2017-01-10 20:41 ` [PATCH v5 00/14] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-10 20:41 ` [PATCH v5 01/14] .mailmap: Use my personal email address as my canonical Richard Hansen
2017-01-10 20:41 ` [PATCH v5 02/14] rev-parse doc: pass "--" to rev-parse in the --prefix example Richard Hansen
2017-01-10 20:41 ` [PATCH v5 03/14] t7610: update branch names to match test number Richard Hansen
2017-01-10 20:41 ` [PATCH v5 04/14] t7610: Move setup code to the 'setup' test case Richard Hansen
2017-01-10 20:41 ` [PATCH v5 05/14] t7610: use test_when_finished for cleanup tasks Richard Hansen
2017-01-10 20:41 ` [PATCH v5 06/14] t7610: don't rely on state from previous test Richard Hansen
2017-01-10 20:41 ` [PATCH v5 07/14] t7610: run 'git reset --hard' after each test to clean up Richard Hansen
2017-01-10 20:41 ` [PATCH v5 08/14] t7610: delete some now-unnecessary 'git reset --hard' lines Richard Hansen
2017-01-10 20:41 ` [PATCH v5 09/14] t7610: always work on a test-specific branch Richard Hansen
2017-01-10 20:41 ` [PATCH v5 10/14] t7610: don't assume the checked-out commit Richard Hansen
2017-01-10 20:41 ` [PATCH v5 11/14] t7610: spell 'git reset --hard' consistently Richard Hansen
2017-01-10 20:42 ` [PATCH v5 12/14] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-10 20:42 ` [PATCH v5 13/14] mergetool: take the "-O" out of $orderfile Richard Hansen
2017-01-10 20:42 ` [PATCH v5 14/14] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-10 4:36 ` [PATCH 0/4] fix mergetool+rerere+subdir regression David Aguilar
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=CAGZ79kb9UvV6AaRLBP5OzyRtTTXarRZRZDMd_1k5n9CrgbVr5A@mail.gmail.com \
--to=sbeller@google.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=hansenr@google.com \
--cc=j6t@kdbg.org \
/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.