From: Junio C Hamano <gitster@pobox.com>
To: Antonio Ospite <ao2@ao2.it>
Cc: git@vger.kernel.org, "Brandon Williams" <bmwill@google.com>,
"Daniel Graña" <dangra@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Richard Hartmann" <richih.mailinglist@gmail.com>,
"Stefan Beller" <sbeller@google.com>
Subject: Re: [PATCH v3 3/7] t7411: be nicer to future tests and really clean things up
Date: Tue, 14 Aug 2018 13:16:38 -0700 [thread overview]
Message-ID: <xmqq7eks1z6h.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180814110525.17801-4-ao2@ao2.it> (Antonio Ospite's message of "Tue, 14 Aug 2018 13:05:21 +0200")
Antonio Ospite <ao2@ao2.it> writes:
> test_expect_success 'error message contains blob reference' '
> + # Remove the error introduced in the previous test.
> + # It is not needed in the following tests.
> + test_when_finished "git -C super reset --hard HEAD^" &&
> (cd super &&
> sha1=$(git rev-parse HEAD) &&
> test-tool submodule-config \
Antonio Ospite <ao2@ao2.it> writes:
> Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with
> invalid lines in .gitmodules but then only the second commit is removed.
>
> This may affect future subsequent tests if they assume that the
> .gitmodules file has no errors.
>
> Remove both the commits as soon as they are not needed anymore.
>
> The error introduced in test 5 is also required by test 6, so the two
> commits from above are removed respectively in tests 6 and 8.
>
> Signed-off-by: Antonio Ospite <ao2@ao2.it>
> ---
> t/t7411-submodule-config.sh | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
> index 0bde5850ac..c6b6cf6fae 100755
> --- a/t/t7411-submodule-config.sh
> +++ b/t/t7411-submodule-config.sh
> @@ -98,6 +98,9 @@ test_expect_success 'error in one submodule config lets continue' '
> '
>
> test_expect_success 'error message contains blob reference' '
> + # Remove the error introduced in the previous test.
> + # It is not needed in the following tests.
> + test_when_finished "git -C super reset --hard HEAD^" &&
Hmm, that is ugly. Depending on where in the subshell the previous
test failed, you'd still be taking us to an unexpected place.
Imagine if "git commit -m 'add error'" failed, for example, in the
test before this one.
I am wondering if the proper fix is to merge the previous one and
this one into a single test. The combined test would
- remember where the HEAD in super is and arrange to come back
to it when test is done
- break .gitmodules and commit it
- run test-tool and check its output
- also check its error output
in a single test_expect_success.
> @@ -123,6 +126,7 @@ test_expect_success 'using different treeishs works' '
> '
>
> test_expect_success 'error in history in fetchrecursesubmodule lets continue' '
> + test_when_finished "git -C super reset --hard HEAD^" &&
> (cd super &&
> git config -f .gitmodules \
> submodule.submodule.fetchrecursesubmodules blabla &&
> @@ -134,8 +138,7 @@ test_expect_success 'error in history in fetchrecursesubmodule lets continue' '
> HEAD b \
> HEAD submodule \
> >actual &&
> - test_cmp expect_error actual &&
> - git reset --hard HEAD^
> + test_cmp expect_error actual
> )
> '
If we want to be more robust, you'd probably need to find a better
anchoring point than HEAD, which can be pointing different commit
depending on where in the subshell the process is hit with ^C,
i.e.
ORIG=$(git -C super rev-parse HEAD) &&
test_when_finished "git -C super reset --hard $ORIG" &&
(
cd super &&
...
The patch is still an improvement compared to the current code,
where a broken test-tool that does not produce expected output in
the file 'actual' is guaranteed to leave us at a commit that we do
not expect to be at, but not entirely satisfactory.
next prev parent reply other threads:[~2018-08-14 20:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-14 11:05 [PATCH v3 0/7] Make submodules work if .gitmodules is not checked out Antonio Ospite
2018-08-14 11:05 ` [PATCH v3 1/7] submodule: add a print_config_from_gitmodules() helper Antonio Ospite
2018-08-14 11:05 ` [PATCH v3 2/7] submodule: factor out a config_set_in_gitmodules_file_gently function Antonio Ospite
2018-08-14 11:05 ` [PATCH v3 3/7] t7411: be nicer to future tests and really clean things up Antonio Ospite
2018-08-14 17:06 ` Brandon Williams
2018-08-14 20:16 ` Junio C Hamano [this message]
2018-08-20 16:46 ` Antonio Ospite
2018-08-14 11:05 ` [PATCH v3 4/7] submodule--helper: add a new 'config' subcommand Antonio Ospite
2018-08-14 17:10 ` Brandon Williams
2018-08-20 16:50 ` Antonio Ospite
2018-08-14 11:05 ` [PATCH v3 5/7] submodule: use the 'submodule--helper config' command Antonio Ospite
2018-08-14 17:12 ` Brandon Williams
2018-08-14 11:05 ` [PATCH v3 6/7] t7506: clean up .gitmodules properly before setting up new scenario Antonio Ospite
2018-08-14 11:05 ` [PATCH v3 7/7] submodule: support reading .gitmodules even when it's not checked out Antonio Ospite
2018-08-14 17:22 ` Brandon Williams
2018-08-14 20:36 ` Junio C Hamano
2018-08-20 21:37 ` Antonio Ospite
2018-08-22 11:51 ` Antonio Ospite
2018-08-22 15:29 ` Junio C Hamano
2018-08-23 11:48 ` Antonio Ospite
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=xmqq7eks1z6h.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=ao2@ao2.it \
--cc=bmwill@google.com \
--cc=dangra@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=richih.mailinglist@gmail.com \
--cc=sbeller@google.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).