Github user zsxwing commented on a diff in the pull request:
https://github.com/apache/spark/pull/23041#discussion_r233734198
--- Diff:
common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java
---
@@ -371,23 +371,29 @@ private void assertErrorsContain(Set<String> errors,
Set<String> contains) {
private void assertErrorAndClosed(RpcResult result, String
expectedError) {
assertTrue("unexpected success: " + result.successMessages,
result.successMessages.isEmpty());
- // we expect 1 additional error, which contains *either* "closed" or
"Connection reset"
+ // we expect 1 additional error, which should contain one of the
follow messages:
+ // - "closed"
+ // - "Connection reset"
+ // - "java.nio.channels.ClosedChannelException"
Set<String> errors = result.errorMessages;
assertEquals("Expected 2 errors, got " + errors.size() + "errors: " +
errors, 2, errors.size());
Set<String> containsAndClosed = Sets.newHashSet(expectedError);
containsAndClosed.add("closed");
containsAndClosed.add("Connection reset");
+ containsAndClosed.add("java.nio.channels.ClosedChannelException");
Pair<Set<String>, Set<String>> r = checkErrorsContain(errors,
containsAndClosed);
- Set<String> errorsNotFound = r.getRight();
- assertEquals(1, errorsNotFound.size());
- String err = errorsNotFound.iterator().next();
- assertTrue(err.equals("closed") || err.equals("Connection reset"));
+ assertTrue("Got a non-empty set " + r.getLeft(),
r.getLeft().isEmpty());
--- End diff --
Moved this check here so that we can see what's the error that causes the
test failure.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
