-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Skip testMergeWithMatrixBuild if gpgsign enabled (#1564)
The testMergeWithMatrixBuild test fails randomly on several machines when commit.gpgsign and tag.gpgsign are not enabled if the TestPreBuildMerge implementation is used. It passes consistently when PreBuildMerge is used. Rather than spend the time trying to diagnose the intermittent failures, this configuration allows the test to be skipped if either of those configuration settings are enabled. Other tests in this class are able to use TestPreBuildMerge without issue. Tested by enabling commit.gpgsign in ~/.gitconfig and by enabling commit.gpgsign in a $XDG_CONFIG_HOME/.gitconfig file. Test was skipped when gpgsign was enabled in either of those files.
- Loading branch information
1 parent
7f8afeb
commit 4275207
Showing
1 changed file
with
33 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters