This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11779

tests: ensure a status will have non ambiguous mtime in some race test
ClosedPublic

Authored by marmoute on Nov 24 2021, 6:11 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG4c61c7f75de6: tests: ensure a status will have non ambiguous mtime in some race test

Summary

For the test to work, we need some mtime to be recorded. For them to be recorded, they need to be "clearly in the past", otherwise edit with the same mtime would be possible.

Strictly speaking there might be file system with a minimal mtime increment
longer than one second. However it is unlikely that we will run the test on
them for now. We can be smarter about this in the future if it becomes
necessary.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Nov 24 2021, 6:11 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 24 2021, 6:11 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D11780: tests: add missing `head` for when things go wrong.Nov 24 2021, 6:11 AM

Alphare accepted this revision.Nov 24 2021, 8:00 AM

This revision is now accepted and ready to land.Nov 24 2021, 8:00 AM

marmoute edited the summary of this revision. (Show Details)Nov 30 2021, 6:53 PM

marmoute added a commit: rHG4c61c7f75de6: tests: ensure a status will have non ambiguous mtime in some race test.Dec 1 2021, 10:20 AM

Closed by commit rHG4c61c7f75de6: tests: ensure a status will have non ambiguous mtime in some race test (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-dirstate-race.t (1 line)

Commit	Parents	Author	Summary	Date
55b092341c35	42688c8ffe05	Pierre-Yves David		Nov 23 2021, 10:32 AM

Status	Author	Revision
Closed	marmoute	D11800 largefile: use the proper "mtime boundary" logic during fixup
Closed	marmoute	D11799 status: move the boundary comparison logic within the timestamp module
Closed	marmoute	D11798 tests: remove potential mtime ambiguity in a dirstate test
Closed	marmoute	D11797 dirstate: cleanup remaining of "now" during write
Closed	marmoute	D11796 dirstate: remove need_delay logic
Closed	marmoute	D11795 dirstate: remove `lastnormaltime` mechanism
Closed	marmoute	D11794 status: use filesystem time boundary to invalidate racy mtime
Closed	marmoute	D11793 test: use a different timestamp for the updated file
Closed	marmoute	D11792 win32text: drop associated dirstate cache information on revert
Closed	marmoute	D11791 dirstate: stop gathering parentfiledata in update_file
Closed	marmoute	D11790 dirstate: stop gathering parentfiledata in update_file_p1
Closed	marmoute	D11789 dirstate: make it mandatory to provide parentfiledata in `set_clean`
Closed	marmoute	D11788 dirstate: do no use `set_clean` in revert
Closed	marmoute	D11787 status: adapt the "keyword" extensions to gather stats at lookup time
Closed	marmoute	D11786 status: adapt largefile to gather stats at lookup time
Closed	marmoute	D11785 status: gather fixup info at comparison time
Closed	marmoute	D11784 update: filter the ambiguous mtime in update directly
Closed	marmoute	D11783 dirstate: move "get fs now" in the timestamp utility module
Closed	marmoute	D11782 dirstate-item: allow mtime to be None in "parentdata"
Closed	marmoute	D11781 dirstate: add a comment about a racy piece of code during updates
Closed	marmoute	D11780 tests: add missing `head` for when things go wrong
Closed	marmoute	D11779 tests: ensure a status will have non ambiguous mtime in some race test
Closed	marmoute	D11778 tests: make sure no ambiguities remains after the commit
Closed	marmoute	D11777 dirstate: clarify a `hg update` invocation in a test
Closed	marmoute	D11833 test: mark rhg output as flaky

Diff 31101

tests/test-dirstate-race.t

	XXX Note that this returns M for files that got replaced by directories. This is			XXX Note that this returns M for files that got replaced by directories. This is
	definitely a bug, but the fix for that is hard and the next status run is fine			definitely a bug, but the fix for that is hard and the next status run is fine
	anyway.			anyway.

	$ cat > $TESTTMP/dirstaterace.sh <<EOF			$ cat > $TESTTMP/dirstaterace.sh <<EOF
	> rm b && rm -r dir1 && rm d && mkdir d && rm e && mkdir e			> rm b && rm -r dir1 && rm d && mkdir d && rm e && mkdir e
	> EOF			> EOF

				$ sleep 1 # ensure non-ambiguous mtime
	$ hg status --config extensions.dirstaterace=$TESTTMP/dirstaterace.py			$ hg status --config extensions.dirstaterace=$TESTTMP/dirstaterace.py
	M d			M d
	M e			M e
	! b			! b
	! dir1/c			! dir1/c
	$ hg debugdirstate			$ hg debugdirstate
	n 644 2 * a (glob)			n 644 2 * a (glob)
	n 0 -1 unset b			n 0 -1 unset b

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31101		Nov 24 2021, 6:11 AM	★	★
Diff 2	31241	rHG4c61c7f75de6c1d25d04a624b57d7260b5ddedb0	Nov 23 2021, 10:32 AM	★	★