summaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
authorTim Brooks <tim@uncontended.net>2017-06-28 10:51:20 -0500
committerGitHub <noreply@github.com>2017-06-28 10:51:20 -0500
commit5f8be0e090f788d9132c2c371f3ecb9c4129bd8e (patch)
treee2858917b831b7406844184ef8de7c4862c98d3d /core/src/main
parent9ce9c21b836834070c584c97a35d2e232d8478d0 (diff)
Introduce NioTransport into framework for testing (#24262)
This commit introduces a nio based tcp transport into framework for testing. Currently Elasticsearch uses a simple blocking tcp transport for testing purposes (MockTcpTransport). This diverges from production where our current transport (netty) is non-blocking. The point of this commit is to introduce a testing variant that more closely matches the behavior of production instances.
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
index 5e40e47b9f..6f5d0ac924 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -58,7 +58,7 @@ grant codeBase "${codebase.junit-4.12.jar}" {
permission java.lang.RuntimePermission "accessDeclaredMembers";
};
-grant codeBase "${codebase.mocksocket-1.1.jar}" {
+grant codeBase "${codebase.mocksocket-1.2.jar}" {
// mocksocket makes and accepts socket connections
permission java.net.SocketPermission "*", "accept,connect";
};