This is an archive of the discontinued Mercurial Phabricator instance.

Differential D926

test-setdiscovery: make test compatible with chg
ClosedPublic

Authored by singhsrb on Oct 3 2017, 4:32 PM.

Download Raw Diff

Details

Reviewers

quark

Group Reviewers

hg-reviewers

Commits

rHG533f32937182: test-setdiscovery: make test compatible with chg

Summary

The test checks the output of the blackbox extension which will
contain logs corresponding to chg in case chg is running. Therefore, this
commit modifies the test to take chg into consideration while working with the
blackbox extension.

Test Plan

Ran the test 'test-setdiscovery.t' with and without the '--chg'
option.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

singhsrb created this revision.Oct 3 2017, 4:32 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 3 2017, 4:32 PM

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

quark updated this revision to Diff 2393.Oct 3 2017, 8:05 PM

I have changed the code to a simpler fix.

singhsrb added inline comments.Oct 3 2017, 8:07 PM

tests/test-setdiscovery.t
407	That's pretty neat. D925 is similar too.

Closed by commit rHG533f32937182: test-setdiscovery: make test compatible with chg (authored by singhsrb). · Explain WhyOct 4 2017, 9:41 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-setdiscovery.t (11 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2386		Oct 3 2017, 4:32 PM	★	★
Diff 2	2393		Oct 3 2017, 8:05 PM	★	★
Diff 3	2407	rHG533f329371828b58d0d064797562d16f8e2be325	Oct 3 2017, 4:30 PM	★	★

Diff 2386

tests/test-setdiscovery.t

	> [extensions]			> [extensions]
	> unrandomsample = $TESTTMP/unrandomsample.py			> unrandomsample = $TESTTMP/unrandomsample.py
	> EOF			> EOF

	$ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox=			$ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox=
	comparing with r2			comparing with r2
	searching for changes			searching for changes
	101 102 103 104 105 106 107 108 109 110 (no-eol)			101 102 103 104 105 106 107 108 109 110 (no-eol)
				#if no-chg
	$ hg -R r1 --config extensions.blackbox= blackbox			$ hg -R r1 --config extensions.blackbox= blackbox
	* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> outgoing r2 -T{rev} * (glob)			* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> outgoing r2 -T{rev} * (glob)
				singhsrbAuthorUnsubmitted Not Done That's pretty neat. D925 is similar too. singhsrb: That's pretty neat. D925 is similar too.
	* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> found 101 common and 1 unknown server heads, 2 roundtrips in .????s (glob)			* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> found 101 common and 1 unknown server heads, 2 roundtrips in .????s (glob)
	* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> -R r1 outgoing r2 -T{rev} * --config extensions.blackbox= exited 0 after *.?? seconds (glob)			* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> -R r1 outgoing r2 -T{rev} * --config extensions.blackbox= exited 0 after *.?? seconds (glob)
	* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> blackbox (glob)			* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> blackbox (glob)
				#else
				The first line of blackbox output will correspond to the chg master server.
				Therefore, glob first line when chg is running.
				$ hg -R r1 --config extensions.blackbox= blackbox
				* (glob)
				* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> outgoing r2 -T{rev} * (glob)
				* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> found 101 common and 1 unknown server heads, 2 roundtrips in .????s (glob)
				* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 ()> -R r1 outgoing r2 -T{rev} * --config extensions.blackbox= exited 0 after *.?? seconds (glob)
				* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> blackbox (glob)
				#endif
	$ cd ..			$ cd ..