This is an automated email from the ASF dual-hosted git repository.
kihwal pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new a628ab0 HADOOP-15787. TestIPC.testRTEDuringConnectionSetup fails with
jdk8u242. Contributed by Zsolt Venczel.
a628ab0 is described below
commit a628ab0863111c65e5fe5526176403177f63e698
Author: Kihwal Lee <kih...@apache.org>
AuthorDate: Wed Feb 5 13:16:34 2020 -0600
HADOOP-15787. TestIPC.testRTEDuringConnectionSetup fails with jdk8u242.
Contributed by Zsolt Venczel.
(cherry picked from commit a463cf75a0ab1f0dbb8cfa16c39a4e698bc1a625)
(cherry picked from commit 0b19c8e0860bf558d995951ab9ac4cd8a1674759)
---
.../src/test/java/org/apache/hadoop/ipc/TestIPC.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
index f275f97..830a826 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -642,6 +641,16 @@ public class TestIPC {
}
/**
+ * Mock socket class to help inject an exception for HADOOP-7428.
+ */
+ static class MockSocket extends Socket {
+ @Override
+ public synchronized void setSoTimeout(int timeout) {
+ throw new RuntimeException("Injected fault");
+ }
+ }
+
+ /**
* Test that, if a RuntimeException is thrown after creating a socket
* but before successfully connecting to the IPC server, that the
* failure is handled properly. This is a regression test for
@@ -654,11 +663,8 @@ public class TestIPC {
SocketFactory spyFactory = spy(NetUtils.getDefaultSocketFactory(conf));
Mockito.doAnswer(new Answer<Socket>() {
@Override
- public Socket answer(InvocationOnMock invocation) throws Throwable {
- Socket s = spy((Socket)invocation.callRealMethod());
- doThrow(new RuntimeException("Injected fault")).when(s)
- .setSoTimeout(anyInt());
- return s;
+ public Socket answer(InvocationOnMock invocation) {
+ return new MockSocket();
}
}).when(spyFactory).createSocket();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
