This is an archive of the discontinued Mercurial Phabricator instance.

Differential D202

tests: fix test-flagprocessor.t flakiness
ClosedPublic

Authored by martinvonz on Jul 31 2017, 7:58 PM.

Details

Reviewers
dsp
akushner
durin42
Group Reviewers
hg-reviewers
Commits
rHGc6146dd10072: tests: fix test-flagprocessor.t flakiness
Summary

The test for duplicate flag processors depended on the timestamps
being set in the dirstate to work. If the time between the the
previous failed commit (which would set the timestamp, due to bug

  1. and the attempted commit with the duplicate flag processors was

small enough, it would fail. The failure was caused by a call to
commands.status() early in the commit process. If the dirstate did not
have the timestamp set, it would need to fetch the file content to
compare with. Since two flag processors had been registered, it would
attempted to base64 decode the contents twice, which would of course
fail.

This patch adds a "hg debugrebuilddirstate" to make it deterministic
and also replaces the test case's "hg commit" by simply "hg status",
since that will trigger reading of the contents and thereby use of the
flag processors as noted above.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 31 2017, 7:58 PM
dsp edited the summary of this revision. (Show Details)Aug 1 2017, 11:33 AM
dsp edited the summary of this revision. (Show Details)
dsp requested changes to this revision.Aug 1 2017, 11:39 AM
dsp added a subscriber: dsp.
dsp added inline comments.
tests/test-flagprocessor.t
168

I think want to either remove this line or glob it.

This revision now requires changes to proceed.Aug 1 2017, 11:39 AM
martinvonz edited edge metadata.Aug 1 2017, 1:14 PM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 475.
martinvonz marked an inline comment as done.Aug 1 2017, 1:14 PM
akushner accepted this revision.Aug 1 2017, 1:23 PM
durin42 accepted this revision.Aug 1 2017, 3:52 PM
durin42 added a subscriber: durin42.

queued 201, 202 for stable

Closed by commit rHGc6146dd10072: tests: fix test-flagprocessor.t flakiness (authored by martinvonz). · Explain WhyAug 1 2017, 3:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-flagprocessor.t (6 lines)

Diff 480

tests/test-flagprocessor.t

$ rm fail-base64-gzip-noop $ rm fail-base64-gzip-noop
# TEST: ensure we cannot register several flag processors on the same flag # TEST: ensure we cannot register several flag processors on the same flag
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> extension=$TESTDIR/flagprocessorext.py > extension=$TESTDIR/flagprocessorext.py
> duplicate=$TESTDIR/flagprocessorext.py > duplicate=$TESTDIR/flagprocessorext.py
> EOF > EOF
$ echo 'this should fail' > file $ hg debugrebuilddirstate
$ hg commit -Aqm 'add file'
*** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
$ hg st 2>&1 | egrep 'cannot register multiple processors|flagprocessorext'
*** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
File "*/tests/flagprocessorext.py", line *, in b64decode (glob)
dspUnsubmitted
Done

I think want to either remove this line or glob it.

dsp: I think want to either remove this line or glob it.
$ cd .. $ cd ..
# TEST: bundle repo # TEST: bundle repo
$ hg init bundletest $ hg init bundletest
$ cd bundletest $ cd bundletest
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF