Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

more tests using HystrixRequestContext rule #1193

Merged
merged 1 commit into from
May 2, 2016
Merged

more tests using HystrixRequestContext rule #1193

merged 1 commit into from
May 2, 2016

Conversation

caarlos0
Copy link
Contributor

Replaced the manual HystrixRequestContext inits and shutdowns with the junit rule.

My IDE also auto-fixed some trailing whitespaces, that's why the pull seems a little big. A diff -w should do the trick.

refs #1184 and #1147

cc/ @mattrjacobs

@cloudbees-pull-request-builder
Copy link

NetflixOSS » Hystrix » Hystrix-pull-requests #457 SUCCESS
This pull request looks good

@mattrjacobs
Copy link
Contributor

Thanks @caarlos0! This looks like it should introduce a circular dependency where hystrix-junit:compile depends on hystrix-core:compile, and hystrix-core:test depends on hystrix-junit:compile. From running tests locally and in CI, it looks like Gradle is able to sidestep the circularity.

@mattrjacobs mattrjacobs merged commit 61ddeae into Netflix:master May 2, 2016
@caarlos0 caarlos0 deleted the context-rule branch May 2, 2016 18:14
@caarlos0
Copy link
Contributor Author

caarlos0 commented May 2, 2016

@mattrjacobs yeap, gradle seems to be smart enough to handle that...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@caarlos0 @cloudbees-pull-request-builder @mattrjacobs