From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 4/5] t6022, t6046: test expected behavior instead of testing a proxy for it
Date: Thu, 12 Mar 2020 14:20:32 +0100 [thread overview]
Message-ID: <20200312132032.GD3122@szeder.dev> (raw)
In-Reply-To: <26d0c34cd1d4a54dab28d0c9c2242336244e8a3c.1582762465.git.gitgitgadget@gmail.com>
On Thu, Feb 27, 2020 at 12:14:23AM +0000, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
>
> In t6022, we were testing for file being overwritten (or not) based on
> an output message instead of checking for the file being overwritten.
> Since we can check for the file being overwritten via mtime updates,
> check that instead.
>
> In t6046, we were largely checking for both the expected behavior and a
> proxy for it, which is unnecessary. The calls to test-tool also were a
> bit cryptic. Make them a little clearer.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> t/t6022-merge-rename.sh | 15 ++++-
> t/t6046-merge-skip-unneeded-updates.sh | 89 +++++++++++++++++---------
> 2 files changed, 70 insertions(+), 34 deletions(-)
>
> diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
> index 6f196aaf276..d97cf48495b 100755
> --- a/t/t6022-merge-rename.sh
> +++ b/t/t6022-merge-rename.sh
> @@ -242,12 +242,23 @@ test_expect_success 'merge of identical changes in a renamed file' '
> rm -f A M N &&
> git reset --hard &&
> git checkout change+rename &&
> +
> + test-tool chmtime =31337 B &&
> + test-tool chmtime --get B >old-mtime &&
Nit: I think it's possible to change the mtime and print it in a
single invocation with:
test-tool chmtime --get =1234 file
> GIT_MERGE_VERBOSITY=3 git merge change >out &&
Nit: The output of 'git merge' is still redirected to a file, but ...
> - test_i18ngrep "^Skipped B" out &&
... the only command looking at the output is now removed.
> + test-tool chmtime --get B >new-mtime &&
> + test_cmp old-mtime new-mtime &&
> +
> git reset --hard HEAD^ &&
> git checkout change &&
> +
> + test-tool chmtime =-1 M &&
> + test-tool chmtime --get M >old-mtime &&
> GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
> - test_i18ngrep ! "^Skipped B" out
Likewise.
> + test-tool chmtime --get B >new-mtime &&
> + test $(cat old-mtime) -lt $(cat new-mtime)
I saw this test fail today in one of my custom CI builds:
+git checkout change
Switched to branch 'change'
+test-tool chmtime =-1 M
+test-tool chmtime --get M
+GIT_MERGE_VERBOSITY=3 git merge change+rename
+test-tool chmtime --get B
+cat old-mtime
+cat new-mtime
+test 1583967731 -lt 1583967731
error: last command exited with $?=1
not ok 12 - merge of identical changes in a renamed file
The contents of 'out', i.e. the output of the 'git merge' command
before the failure is:
Auto-merging B
Merge made by the 'recursive' strategy.
A => B | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename A => B (100%)
This is a rare failure, this is the first time I saw it, and to make
things worse, this one time it happened on big-endian and with all the
GIT_TEST_* knobs enabled.
https://travis-ci.org/github/szeder/git-cooking-topics-for-travis-ci/jobs/661294571#L4020
I've been running './t6022-merge-rename.sh --stress -r 1,12' both with
and without all the GIT_TEST_* knobs for a few hundred repetitions,
but couldn't trigger the failure yet...
I wonder whether comparing the mtimes with '-le' instead of '-lt' is
acceptable in this test case, but don't have enough insight to form an
opinion. Note that this patch added a few similar mtime comparisons
to t6046 below, and they might be prone to the same issue as well.
> test_expect_success 'setup for rename + d/f conflicts' '
> diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh
> index b7e46698321..962030ecdb6 100755
> --- a/t/t6046-merge-skip-unneeded-updates.sh
> +++ b/t/t6046-merge-skip-unneeded-updates.sh
> @@ -71,16 +71,16 @@ test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' '
>
> git checkout A^0 &&
>
> - test-tool chmtime =31337 b &&
> - test-tool chmtime -v +0 b >expected-mtime &&
> + test-tool chmtime =-1 b &&
> + test-tool chmtime --get b >old-mtime &&
>
> GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep "Skipped b" out &&
> test_must_be_empty err &&
>
> - test-tool chmtime -v +0 b >actual-mtime &&
> - test_cmp expected-mtime actual-mtime &&
> + # Make sure b was NOT updated
> + test-tool chmtime --get b >new-mtime &&
> + test_cmp old-mtime new-mtime &&
>
> git ls-files -s >index_files &&
> test_line_count = 1 index_files &&
> @@ -102,9 +102,14 @@ test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' '
>
> git checkout B^0 &&
>
> + test-tool chmtime =-1 b &&
> + test-tool chmtime --get b >old-mtime &&
> GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
>
> - test_i18ngrep "Auto-merging b" out &&
> + # Make sure b WAS updated
> + test-tool chmtime --get b >new-mtime &&
> + test $(cat old-mtime) -lt $(cat new-mtime) &&
> +
> test_must_be_empty err &&
>
> git ls-files -s >index_files &&
> @@ -165,10 +170,10 @@ test_expect_success '2a-L: Modify/rename, merge into modify side' '
>
> git checkout A^0 &&
>
> + test_path_is_missing c &&
> GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep ! "Skipped c" out &&
> - test_must_be_empty err &&
> + test_path_is_file c &&
>
> git ls-files -s >index_files &&
> test_line_count = 1 index_files &&
> @@ -193,9 +198,14 @@ test_expect_success '2a-R: Modify/rename, merge into rename side' '
>
> git checkout B^0 &&
>
> + test-tool chmtime =-1 c &&
> + test-tool chmtime --get c >old-mtime &&
> GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
>
> - test_i18ngrep ! "Skipped c" out &&
> + # Make sure c WAS updated
> + test-tool chmtime --get c >new-mtime &&
> + test $(cat old-mtime) -lt $(cat new-mtime) &&
> +
> test_must_be_empty err &&
>
> git ls-files -s >index_files &&
> @@ -256,16 +266,15 @@ test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
>
> git checkout A^0 &&
>
> - test-tool chmtime =31337 c &&
> - test-tool chmtime -v +0 c >expected-mtime &&
> -
> + test-tool chmtime =-1 c &&
> + test-tool chmtime --get c >old-mtime &&
> GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep "Skipped c" out &&
> test_must_be_empty err &&
>
> - test-tool chmtime -v +0 c >actual-mtime &&
> - test_cmp expected-mtime actual-mtime &&
> + # Make sure c WAS updated
> + test-tool chmtime --get c >new-mtime &&
> + test_cmp old-mtime new-mtime &&
>
> git ls-files -s >index_files &&
> test_line_count = 1 index_files &&
> @@ -290,9 +299,12 @@ test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
>
> git checkout B^0 &&
>
> + test_path_is_missing c &&
> GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
>
> - test_i18ngrep "Auto-merging c" out &&
> + # Make sure c now present (and thus was updated)
> + test_path_is_file c &&
> +
> test_must_be_empty err &&
>
> git ls-files -s >index_files &&
> @@ -361,13 +373,18 @@ test_expect_success '2c: Modify b & add c VS rename b->c' '
>
> git checkout A^0 &&
>
> + test-tool chmtime =-1 c &&
> + test-tool chmtime --get c >old-mtime &&
> GIT_MERGE_VERBOSITY=3 &&
> export GIT_MERGE_VERBOSITY &&
> test_must_fail git merge -s recursive B^0 >out 2>err &&
>
> test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
> - test_i18ngrep ! "Skipped c" out &&
> - test_must_be_empty err
> + test_must_be_empty err &&
> +
> + # Make sure c WAS updated
> + test-tool chmtime --get c >new-mtime &&
> + test $(cat old-mtime) -lt $(cat new-mtime)
>
> # FIXME: rename/add conflicts are horribly broken right now;
> # when I get back to my patch series fixing it and
> @@ -460,11 +477,13 @@ test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
>
> git checkout A^0 &&
>
> + test_path_is_missing bar/bq &&
> GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep ! "Skipped bar/bq" out &&
> test_must_be_empty err &&
>
> + test_path_is_file bar/bq &&
> +
> git ls-files -s >index_files &&
> test_line_count = 2 index_files &&
>
> @@ -488,11 +507,13 @@ test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
>
> git checkout B^0 &&
>
> + test_path_is_missing bar/bq &&
> GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
>
> - test_i18ngrep ! "Skipped bar/bq" out &&
> test_must_be_empty err &&
>
> + test_path_is_file bar/bq &&
> +
> git ls-files -s >index_files &&
> test_line_count = 2 index_files &&
>
> @@ -552,11 +573,13 @@ test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
>
> git checkout A^0 &&
>
> + test_path_is_missing bar/bq &&
> GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep ! "Skipped bar/bq" out &&
> test_must_be_empty err &&
>
> + test_path_is_file bar/bq &&
> +
> git ls-files -s >index_files &&
> test_line_count = 2 index_files &&
>
> @@ -580,11 +603,13 @@ test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
>
> git checkout B^0 &&
>
> + test_path_is_missing bar/bq &&
> GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
>
> - test_i18ngrep ! "Skipped bar/bq" out &&
> test_must_be_empty err &&
>
> + test_path_is_file bar/bq &&
> +
> git ls-files -s >index_files &&
> test_line_count = 2 index_files &&
>
> @@ -654,16 +679,16 @@ test_expect_failure '4a: Change on A, change on B subset of A, dirty mods presen
> git checkout A^0 &&
> echo "File rewritten" >b &&
>
> - test-tool chmtime =31337 b &&
> - test-tool chmtime -v +0 b >expected-mtime &&
> + test-tool chmtime =-1 b &&
> + test-tool chmtime --get b >old-mtime &&
>
> GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep "Skipped b" out &&
> test_must_be_empty err &&
>
> - test-tool chmtime -v +0 b >actual-mtime &&
> - test_cmp expected-mtime actual-mtime &&
> + # Make sure b was NOT updated
> + test-tool chmtime --get b >new-mtime &&
> + test_cmp old-mtime new-mtime &&
>
> git ls-files -s >index_files &&
> test_line_count = 1 index_files &&
> @@ -722,16 +747,16 @@ test_expect_success '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mo
> git checkout A^0 &&
> echo "File rewritten" >c &&
>
> - test-tool chmtime =31337 c &&
> - test-tool chmtime -v +0 c >expected-mtime &&
> + test-tool chmtime =-1 c &&
> + test-tool chmtime --get c >old-mtime &&
>
> GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
>
> - test_i18ngrep "Skipped c" out &&
> test_must_be_empty err &&
>
> - test-tool chmtime -v +0 c >actual-mtime &&
> - test_cmp expected-mtime actual-mtime &&
> + # Make sure c was NOT updated
> + test-tool chmtime --get c >new-mtime &&
> + test_cmp old-mtime new-mtime &&
>
> git ls-files -s >index_files &&
> test_line_count = 1 index_files &&
> --
> gitgitgadget
>
next prev parent reply other threads:[~2020-03-12 13:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 0:14 [PATCH 0/5] Testcase cleanups (merge related) Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 1/5] t602[1236], t6034: modernize test formatting Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 2/5] t6020, t6022, t6035: update merge tests to use test helper functions Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 3/5] t3035: prefer test_must_fail to bash negation for git commands Elijah Newren via GitGitGadget
2020-02-27 0:14 ` [PATCH 4/5] t6022, t6046: test expected behavior instead of testing a proxy for it Elijah Newren via GitGitGadget
2020-03-12 13:20 ` SZEDER Gábor [this message]
2020-03-12 16:48 ` Elijah Newren
2020-03-12 17:35 ` Elijah Newren
2020-03-12 20:01 ` SZEDER Gábor
2020-03-13 17:17 ` SZEDER Gábor
2020-03-13 17:45 ` Elijah Newren
2020-03-13 17:12 ` SZEDER Gábor
2020-03-13 17:18 ` Elijah Newren
2020-03-13 17:30 ` SZEDER Gábor
2020-03-13 18:11 ` Elijah Newren
2020-02-27 0:14 ` [PATCH 5/5] t6020: new test with interleaved lexicographic ordering of directories Elijah Newren via GitGitGadget
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=20200312132032.GD3122@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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.
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).