From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 1/9] t/: new helper for tests that pass with ort but fail with recursive
Date: Fri, 23 Oct 2020 11:27:24 -0700 [thread overview]
Message-ID: <CABPp-BGsrMX8brBq4ckhMVmXS7+1A9uaieJfYc3k3mBT4+5xVg@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BEtBWktGB0ksfk5YLhVDfmUJ-QxUMiYtMANL1KhXd8qTA@mail.gmail.com>
One more comment...
On Fri, Oct 23, 2020 at 10:25 AM Elijah Newren <newren@gmail.com> wrote:
>
> On Fri, Oct 23, 2020 at 9:48 AM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> >
> > And the users are just too pleasant to see, with full of "failure
> > sucess", which is the second best outcome we want to see ;-)
> >
> > > +test_expect_merge_algorithm failure success 'check symlink mo...
> > > +test_expect_merge_algorithm failure success 'check symlink ad...
> > > +test_expect_merge_algorithm failure success 'check submodule ...
> > > +test_expect_merge_algorithm failure success 'check submodule ...
> > > +test_expect_merge_algorithm failure success 'check conflictin...
> > > +test_expect_merge_algorithm failure success 'rad-check: renam...
> > > +test_expect_merge_algorithm failure success 'rrdd-check: rena...
> > > +test_expect_merge_algorithm failure success 'mod6-check: chai...
> > > +test_expect_merge_algorithm failure success '6b1: Same rename...
> > > +test_expect_merge_algorithm failure success '6b2: Same rename...
> > > +test_expect_merge_algorithm failure success '10e: Does git co...
> > > +test_expect_merge_algorithm failure success '12b1: Moving two...
> > > +test_expect_merge_algorithm failure success '12c1: Moving one...
> > > +test_expect_merge_algorithm failure success '12f: Trivial dir...
> > > +test_expect_merge_algorithm failure success '4a: Change on A,...
> > > +test_expect_merge_algorithm failure success 'merge-recursive ...
>
> :-)
Actually, there are another 12 submodule-related tests that pass under
ort but not under recursive, spread across t3512, t3513, t5572, t6437,
and t6438. I didn't (yet) apply the same change there, so they all
show up as "TODO passed" if you check out the 'ort' branch of my repo
and run the tests with GIT_TEST_MERGE_ALGORITHM=ort. I delayed
marking them as expecting success under ort because I suspect that
nearby tests should also pass but are just coded too stringently.
(For example, perhaps they expected a directory/submodule conflict to
result in all files within the conflicting directory to be renamed out
of the way instead of expecting the submodule to be moved aside --
moving the submodule aside results in massively less rename handling
pressure and is an easier way to make sure that the files under the
conflicting directory aren't written into and over entries within the
submodule.)
I was hoping to get a submodule expert to look over those tests and
provide some opinions...
next prev parent reply other threads:[~2020-10-23 18:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 16:01 [PATCH 0/9] Support both merge backends in the testsuite, via environment variable Elijah Newren via GitGitGadget
2020-10-23 16:01 ` [PATCH 1/9] t/: new helper for tests that pass with ort but fail with recursive Elijah Newren via GitGitGadget
2020-10-23 16:48 ` Junio C Hamano
2020-10-23 17:25 ` Elijah Newren
2020-10-23 18:27 ` Elijah Newren [this message]
2020-10-24 10:49 ` Đoàn Trần Công Danh
2020-10-24 16:53 ` Elijah Newren
2020-10-25 13:49 ` Đoàn Trần Công Danh
2020-10-26 14:56 ` Elijah Newren
2020-10-26 17:43 ` Junio C Hamano
2020-10-23 16:01 ` [PATCH 2/9] merge tests: expect improved directory/file conflict handling in ort Elijah Newren via GitGitGadget
2020-10-23 17:40 ` Elijah Newren
2020-10-23 16:01 ` [PATCH 3/9] t6416: correct expectation for rename/rename(1to2) + directory/file Elijah Newren via GitGitGadget
2020-10-23 16:01 ` [PATCH 4/9] t6404, t6423: expect improved rename/delete handling in ort backend Elijah Newren via GitGitGadget
2020-10-23 16:01 ` [PATCH 5/9] t6423: expect improved conflict markers labels in the " Elijah Newren via GitGitGadget
2020-10-23 16:01 ` [PATCH 6/9] merge tests: expect slight differences in output for recursive vs. ort Elijah Newren via GitGitGadget
2020-10-24 16:06 ` Elijah Newren
2020-10-23 16:01 ` [PATCH 7/9] t6423, t6436: note improved ort handling with dirty files Elijah Newren via GitGitGadget
2020-10-23 16:01 ` [PATCH 8/9] t6423: note improved ort handling with untracked files Elijah Newren via GitGitGadget
2020-10-23 16:01 ` [PATCH 9/9] t6423: add more details about direct resolution of directories Elijah Newren via GitGitGadget
2020-10-23 20:12 ` Elijah Newren
2020-10-26 17:01 ` [PATCH v2 0/9] Support both merge backends in the testsuite, via environment variable Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 1/9] t/: new helper for tests that pass with ort but fail with recursive Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 2/9] merge tests: expect improved directory/file conflict handling in ort Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 3/9] t6416: correct expectation for rename/rename(1to2) + directory/file Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 4/9] t6404, t6423: expect improved rename/delete handling in ort backend Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 5/9] t6423: expect improved conflict markers labels in the " Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 6/9] merge tests: expect slight differences in output for recursive vs. ort Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 7/9] t6423, t6436: note improved ort handling with dirty files Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 8/9] t6423: note improved ort handling with untracked files Elijah Newren via GitGitGadget
2020-10-26 17:01 ` [PATCH v2 9/9] t6423: add more details about direct resolution 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BGsrMX8brBq4ckhMVmXS7+1A9uaieJfYc3k3mBT4+5xVg@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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.
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 NNTP newsgroup(s).