From c833d4c5d4ff284c499d67edf132c5710f7acec5 Mon Sep 17 00:00:00 2001 From: Gris333 Date: Thu, 11 Dec 2025 11:40:07 +0800 Subject: [PATCH] fix: avoid None.strip() error in TCP mode by checking server_socket --- test/case/miniob_test.py | 4 ++-- test/integration_test/miniob/miniob_client.py | 2 +- test/integration_test/miniob/miniob_server.py | 2 +- test/integration_test/miniob_test_util.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/case/miniob_test.py b/test/case/miniob_test.py index c195fea65..6d06afd8b 100755 --- a/test/case/miniob_test.py +++ b/test/case/miniob_test.py @@ -110,7 +110,7 @@ def __init__(self, base_dir: str, data_dir: str, config_file: str, server_port: self.__check_config(config_file) self.__config = config_file self.__server_port = server_port - self.__server_socket = server_socket.strip() + self.__server_socket = server_socket.strip() if server_socket else '' self.__process = None @@ -274,7 +274,7 @@ def __init__(self, server_port: int, server_socket: str, time_limit:int = 10): raise(Exception("Invalid server port: " + str(server_port))) self.__server_port = server_port - self.__server_socket = server_socket.strip() + self.__server_socket = server_socket.strip() if server_socket else '' self.__socket = None self.__buffer_size = 8192 diff --git a/test/integration_test/miniob/miniob_client.py b/test/integration_test/miniob/miniob_client.py index c71467a02..2056e7f8e 100644 --- a/test/integration_test/miniob/miniob_client.py +++ b/test/integration_test/miniob/miniob_client.py @@ -33,7 +33,7 @@ def __init__(self, *, self.__logger = _logger self.__server_port = server_port - self.__server_socket = server_socket.strip() + self.__server_socket = server_socket.strip() if server_socket else '' self.__time_limit = time_limit self.__socket = None self.__buffer_size = 8192 diff --git a/test/integration_test/miniob/miniob_server.py b/test/integration_test/miniob/miniob_server.py index c1969107e..f4b82c353 100644 --- a/test/integration_test/miniob/miniob_server.py +++ b/test/integration_test/miniob/miniob_server.py @@ -54,7 +54,7 @@ def __init__(self, *, self.__check_config(config_file) self.__config = config_file self.__server_port = server_port - self.__server_socket = server_socket.strip() + self.__server_socket = server_socket.strip() if server_socket else '' self.__process = None self.__core_path = core_path diff --git a/test/integration_test/miniob_test_util.py b/test/integration_test/miniob_test_util.py index e1e80ed7d..997d10d43 100644 --- a/test/integration_test/miniob_test_util.py +++ b/test/integration_test/miniob_test_util.py @@ -126,7 +126,7 @@ def __init__(self, *, self.__check_config(config_file) self.__config = config_file self.__server_port = server_port - self.__server_socket = server_socket.strip() + self.__server_socket = server_socket.strip() if server_socket else '' self.__process = None self.__core_path = core_path @@ -388,7 +388,7 @@ def __init__(self, *, self.__logger:logging.Logger = _logger self.__server_port = server_port - self.__server_socket = server_socket.strip() + self.__server_socket = server_socket.strip() if server_socket else '' self.__socket = None self.__buffer_size = 8192