D8146: tests: stabilize test-rename-merge2.t on Windows
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Feb 25 06:05:41 UTC 2020
martinvonz added a comment.
In D8146#121279 <https://phab.mercurial-scm.org/D8146#121279>, @mharbison72 wrote:
> In D8146#121277 <https://phab.mercurial-scm.org/D8146#121277>, @martinvonz wrote:
>
>> In D8146#121271 <https://phab.mercurial-scm.org/D8146#121271>, @mharbison72 wrote:
>>
>>> In D8146#121267 <https://phab.mercurial-scm.org/D8146#121267>, @marmoute wrote:
>>>
>>>> Since the line does not occurs on linux, this probably got affected by some other change without being noticed.
>>>
>>> Makes sense for why it was missed, but I bisected it back to the referenced commit. I know @martinvonz made some other related changes prior to that commit that had similar test fallout on Windows, but it isn't obvious to me why the referenced commit would change the order of when the background thread spins up.
>>
>> Perhaps the line doesn't actually happen before that commit? You can try removing the `(?)` in the commit before my commit and see if that line is actually printed. I'm thinking that that commit pushed the number of files to close above some threshold that made it get printed. In that case, it was probably some of my earlier commits that made it no longer get printed and we just didn't notice since `(?)` means optional (no error if it doesn't get printed).
>
> I can confirm that it was required in e1ecfc7c84be <https://phab.mercurial-scm.org/rHGe1ecfc7c84be922c28aedd80bc2ebcbe1d415e5d>, and reconfirmed that it is needed in the latest code by removing the line from both. I'm not too worried about why it popped up- it just seemed odd that it didn't with the earlier followup patch I added to fix similar conditionalizing of this exact text elsewhere, and the commit where it started failing looked innocuous.
Yeah, I'm not worried about it either. Thanks for checking. (I wasn't holding off queuing this one because of that, I was/am just busy with other stuff.)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8146/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8146
To: mharbison72, #hg-reviewers, marmoute
Cc: martinvonz, marmoute, mercurial-devel
More information about the Mercurial-devel
mailing list