lntest/timeouts: fix timeout build predicates#4781
Merged
cfromknecht merged 2 commits intoNov 18, 2020
Conversation
Otherwise this breaks various conditional compilation targets and the linter.
Currently trying to run etcd tests on darwin will cause the timeouts to improperly select timeouts_darwin.go which are stricter than timeouts_etcd.go. We fix this by always defaulting to timeouts_etcd.go no matter the platform, and only falling back to timeouts_darwin.go if the kvdb_etcd tag is not present.
cfromknecht
changed the title
wpaulino
approved these changes
Nov 18, 2020
4 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR removes spaces from the timeout build predicates, which causes parsing errors
when compiling/linting darwin targets. We also correct the timeouts to use the etcd
timeouts when running w/
darwin,kvdb_etcd, which currently fall back to plain darwintimeouts.