Re-enable the macOS conflict acceptance tests #1778
Merged
Conversation
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
teor2345
added
C-bug
|
Windows will fail until #1782 is merged |
We disabled these tests pending ZcashFoundation#1613. But the comment incorrectly said we were waiting for ZcashFoundation#1631.
teor2345
force-pushed
the
enable-macos-conflict
branch
from
7442076
to
cb3020a
Compare
|
macOS failed because I pushed a fix that disables that cleanup code on macOS as well. |
teor2345
force-pushed
the
enable-macos-conflict
branch
from
cb3020a
to
99df8f3
Compare
dconnolly
approved these changes
Feb 19, 2021
|
The testnet large sync failure will be fixed by #1789 |
|
Removing all the blockers, because closing the PR didn't do that for some reason 😢 |
18 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
We didn't re-enable the macOS conflict tests as part of PR #1613.
(The comment said we were waiting for PR #1631, but we were actually waiting for #1613.)