From 90e89e30cf5d2b5f0ae298d217ad314e1d5a98ca Mon Sep 17 00:00:00 2001 From: jrhee17 Date: Fri, 4 Nov 2022 13:51:26 +0900 Subject: [PATCH] more cleanups --- core/src/test/java/com/linecorp/armeria/server/ServerTest.java | 2 +- .../armeria/internal/testing/ArmeriaBlockHoundIntegration.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/test/java/com/linecorp/armeria/server/ServerTest.java b/core/src/test/java/com/linecorp/armeria/server/ServerTest.java index 48b2cdafd701..d5e8ae2f587c 100644 --- a/core/src/test/java/com/linecorp/armeria/server/ServerTest.java +++ b/core/src/test/java/com/linecorp/armeria/server/ServerTest.java @@ -418,7 +418,7 @@ void defaultStartStopExecutor() { threads.add(server.stop().thenApply(unused -> Thread.currentThread()).join()); threads.add(server.start().thenApply(unused -> Thread.currentThread()).join()); - threads.forEach(t -> assertThat(t.getName()).startsWith("globalEventExecutor")); + threads.forEach(t -> assertThat(t.getName()).startsWith("startstop-support")); } @Test diff --git a/testing-internal/src/main/java/com/linecorp/armeria/internal/testing/ArmeriaBlockHoundIntegration.java b/testing-internal/src/main/java/com/linecorp/armeria/internal/testing/ArmeriaBlockHoundIntegration.java index e7f9b2a1028e..8d827f3b4ad6 100644 --- a/testing-internal/src/main/java/com/linecorp/armeria/internal/testing/ArmeriaBlockHoundIntegration.java +++ b/testing-internal/src/main/java/com/linecorp/armeria/internal/testing/ArmeriaBlockHoundIntegration.java @@ -32,9 +32,6 @@ public void applyTo(Builder builder) { "pool"); builder.allowBlockingCallsInside("com.linecorp.armeria.testing.server.ServiceRequestContextCaptor$2", "serve"); - // jetty server is started up from GlobalEventExecutor - builder.allowBlockingCallsInside("com.linecorp.armeria.server.jetty.JettyService", - "start"); // graphql builder.allowBlockingCallsInside("graphql.i18n.I18n", "i18n");