From 65de0a24ea030de6bc0af330c73f3a772fa41e36 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 16 Dec 2023 10:04:42 +0100 Subject: Revert "Jonmv/reapply zk 3.9.1" --- .../test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'container-core') diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java index eac7b7c5df7..cdebd41d177 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java @@ -216,12 +216,13 @@ class ProxyProtocolTest { } } + /* Don't close Jetty to early ensuring that the request log is written */ private static void assertLogSizeAndCloseDriver( JettyTestDriver driver, InMemoryRequestLog reqLog, int expectedReqLogSize, InMemoryConnectionLog connLog, int expectedConnLogSize) { Predicate waitCondition = __ -> - reqLog.entries().size() < expectedReqLogSize && connLog.logEntries().size() < expectedConnLogSize; + reqLog.entries().size() < expectedConnLogSize && connLog.logEntries().size() < expectedConnLogSize; await(waitCondition); assertTrue(driver.close()); if (waitCondition.test(null)) await(waitCondition); -- cgit v1.2.3