Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Various improvements to unit tests. #559

Merged
merged 3 commits into from
May 9, 2019
Merged

Various improvements to unit tests. #559

merged 3 commits into from
May 9, 2019

Conversation

tomwilkie
Copy link
Contributor

  • Stop ingester tests from taking 60s, by setting Cortex shutdown wait period to 0 (its theres to allow one final scrape of metrics in production)
  • Listen on localhost in promtail tests, to prevent dialog warning on MacOS (probably cause of TestPromtail is flaky #558)

tomwilkie added 3 commits May 8, 2019 09:48
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
@tomwilkie
Copy link
Contributor Author

Depends on weaveworks/common#153, but happy to merge this as we're using my branch for now.

@daixiang0
Copy link
Contributor

Cool.
Could it be easy to re-depend on origin weaveworks/common?
Where will the fork live? Cause it seems there's a lot of interest and PRs in the original if you guys are going to maintain it. Or is this more of a one off fork?

@tomwilkie
Copy link
Contributor Author

I'll flip back to upstream once that PR is merged. WW usually merge them; I'm the main contributor to it :-)

@tomwilkie tomwilkie merged commit 13c667c into master May 9, 2019
@tomwilkie tomwilkie deleted the improve-tests branch May 9, 2019 10:21
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants