Skip to content

Commit

Permalink
HBASE-27857 Fix timeout exception handling in HBaseClassTestRule. (ap…
Browse files Browse the repository at this point in the history
…ache#5231)

HBaseClassTestRule applies a timeout and a system exit rule to tests.
The timeout rule throws an exception if it hits the timeout threshold.
Since the timeout rule is applied after the system exit rule, the
system exit rule does not see the exception and does not re-enable
the system exit behavior which can cause maven to hang on some
tests.

This change applies the timeout rule before the system exit rule so
that normal system exit can be restored before the surefire forked
node is shutdown.

Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 220eacf)
  • Loading branch information
jonathan-albrecht-ibm authored and Apache9 committed May 13, 2023
1 parent 357866b commit 4df157d
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public static HBaseClassTestRule forClass(Class<?> clazz) {

@Override
public Statement apply(Statement base, Description description) {
return timeout.apply(systemExitRule.apply(base, description), description);
return systemExitRule.apply(timeout.apply(base, description), description);
}

}

0 comments on commit 4df157d

Please sign in to comment.