Throw TestFailedOnTimeoutException instead of plain Exception on timeout. Fixes #771 #823
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
added 11 commits
November 28, 2013 18:51
and provide getters for timeout and time unit
…edoutexception Conflicts: src/test/java/org/junit/tests/AllTests.java
|
Looks good to me. @kcooney Do you want to take a look? |
|
Looks great! Could you please update https://github.com/junit-team/junit/wiki/4.12-release-notes ? |
kcooney
added a commit
that referenced
this pull request
Feb 18, 2014
Throw TestFailedOnTimeoutException instead of plain Exception on timeout. Fixes #771
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.
Created a separate branch with the changes I've made and fully merged from upstream/master. This one should probably merge better than the newline-broken tree in PR #777