-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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.
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
Support multiple HTTP status codes for HttpWaitStrategy #630
Merged
bsideup
merged 17 commits into
testcontainers:master
from
dadoonet:pr/http-multiple-ports
Apr 13, 2018
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
cf637ce
Support multiple HTTP status codes for HttpWaitStrategy
dadoonet da44bd9
Revert changes in Deprecated class
dadoonet 0af2eab
Merge branch 'master' into pr/http-multiple-ports
dadoonet e5ddd16
Revert changes in Deprecated class
dadoonet 1b7cbaf
Make forStatusCode chainable and add forStatusCodeMatching method
dadoonet f2d1592
Fix quality
dadoonet bf12100
Fix compile issue
dadoonet 3b34909
Support both Predicates and Status codes
dadoonet afe06dc
Fix setter
dadoonet 9f1b28a
Revert unrelated change
dadoonet cb4875d
Merge branch 'master' into pr/http-multiple-ports
dadoonet bb39373
Fix error message (note that with predicates it might be incorrect th…
dadoonet 10ca9cd
Fix default predicate
dadoonet 370c35a
Move WaitStrategy tests to the right package
dadoonet 808dcf8
Add a test (and fix the bug!)
dadoonet d6837f7
Add more tests
dadoonet 6b24c2a
Add entry in changelog
dadoonet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
48 changes: 0 additions & 48 deletions
48
core/src/test/java/org/testcontainers/junit/wait/HostPortWaitStrategyTest.java
This file was deleted.
Oops, something went wrong.
72 changes: 0 additions & 72 deletions
72
core/src/test/java/org/testcontainers/junit/wait/HttpWaitStrategyTest.java
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm... I'm not sure these changes are related to the PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's somewhat needed to test the new methods I added. See
strategy/HttpWaitStrategyTest.java
class.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should just start using new implementation (under
org.testcontainers.containers.wait.strategy
package) inHttpWaitStrategyTest
&AbstractWaitStrategyTest
since the old classes are just wrappers nowThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dadoonet ping :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hum. I'm missing something. I probably misunderstood what you are expecting.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But I added a call to my method
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But I added a call to my method
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should just fix the imports in the old test and start using new wait strategies, so that you can also add your new method to that test
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works for me. I'll do that. In which case, I'll also move the tests to the new package, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, thanks :)