You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/09/27 08:37:27 UTC

[tomcat] branch main updated: Adjust unit tests for switch to hex connection IDs

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 4d60e4d  Adjust unit tests for switch to hex connection IDs
4d60e4d is described below

commit 4d60e4d8fb8158b42af427b8d7ed0db788295c40
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 27 09:37:20 2021 +0100

    Adjust unit tests for switch to hex connection IDs
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java b/test/org/apache/coyote/http2/TestHttp2Limits.java
index f4a7b35..3f76c29 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -288,7 +288,7 @@ public class TestHttp2Limits extends Http2TestBase {
             // expression (since we don't know the connection ID). Generate the
             // string as a regular expression and then replace '[' and ']' with
             // the escaped values.
-            String limitMessage = sm.getString("http2Parser.headerLimitSize", "\\d++", "3");
+            String limitMessage = sm.getString("http2Parser.headerLimitSize", "\\p{XDigit}++", "3");
             limitMessage = limitMessage.replace("[", "\\[").replace("]", "\\]");
             // Connection reset. Connection ID will vary so use a pattern
             // On some platform / Connector combinations the TCP connection close
@@ -546,7 +546,7 @@ public class TestHttp2Limits extends Http2TestBase {
             // expression (since we don't know the connection ID). Generate the
             // string as a regular expression and then replace '[' and ']' with
             // the escaped values.
-            String limitMessage = sm.getString("http2Parser.headerLimitSize", "\\d++", "3");
+            String limitMessage = sm.getString("http2Parser.headerLimitSize", "\\p{XDigit}++", "3");
             limitMessage = limitMessage.replace("[", "\\[").replace("]", "\\]");
             MatcherAssert.assertThat(output.getTrace(), RegexMatcher.matchesRegex(
                     "0-Goaway-\\[3\\]-\\[11\\]-\\[" + limitMessage + "\\]"));

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org