From fc538ad113048fff4305d066d3877cb98563db67 Mon Sep 17 00:00:00 2001 From: Crispin Logan Date: Tue, 15 Aug 2023 22:13:48 +0100 Subject: [PATCH 1/2] Fix regex log_string_to_wait_for to be more generic for changing versions of mysql Signed-off-by: Crispin Logan --- sdk/python/tests/unit/test_sql_registry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/tests/unit/test_sql_registry.py b/sdk/python/tests/unit/test_sql_registry.py index 1c2b5a36dd..bdd4ce4973 100644 --- a/sdk/python/tests/unit/test_sql_registry.py +++ b/sdk/python/tests/unit/test_sql_registry.py @@ -91,7 +91,7 @@ def mysql_registry(): container.start() # The log string uses '8.0.*' since the version might be changed as new Docker images are pushed. - log_string_to_wait_for = "/usr/sbin/mysqld: ready for connections. Version: '8.0.*' socket: '/var/run/mysqld/mysqld.sock' port: 3306" + log_string_to_wait_for = "/usr/sbin/mysqld: ready for connections. Version: '(\d+(\.\d+){1,2})' socket: '/var/run/mysqld/mysqld.sock' port: 3306" waited = wait_for_logs( container=container, predicate=log_string_to_wait_for, From a3d067f1e757fb5242f2252e96f510634afb72be Mon Sep 17 00:00:00 2001 From: Crispin Logan Date: Tue, 15 Aug 2023 22:16:54 +0100 Subject: [PATCH 2/2] Add noqa otherwise flake incorrectly flags W605 Signed-off-by: Crispin Logan --- sdk/python/tests/unit/test_sql_registry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/tests/unit/test_sql_registry.py b/sdk/python/tests/unit/test_sql_registry.py index bdd4ce4973..39896d3a9d 100644 --- a/sdk/python/tests/unit/test_sql_registry.py +++ b/sdk/python/tests/unit/test_sql_registry.py @@ -91,7 +91,7 @@ def mysql_registry(): container.start() # The log string uses '8.0.*' since the version might be changed as new Docker images are pushed. - log_string_to_wait_for = "/usr/sbin/mysqld: ready for connections. Version: '(\d+(\.\d+){1,2})' socket: '/var/run/mysqld/mysqld.sock' port: 3306" + log_string_to_wait_for = "/usr/sbin/mysqld: ready for connections. Version: '(\d+(\.\d+){1,2})' socket: '/var/run/mysqld/mysqld.sock' port: 3306" # noqa: W605 waited = wait_for_logs( container=container, predicate=log_string_to_wait_for,