Skip to content

Commit 6a76770

Browse files
authored
fix: avoid None.strip() error in TCP mode by checking server_socket (#633)
### What problem were solved in this pull request? Problem: When `server_socket` parameter is `None` (which is valid when using TCP port mode only), the code calls `server_socket.strip()` which raises an `AttributeError` because `None` has no `strip()` method. This prevents the test framework from initializing properly when Unix socket is not configured. ### What is changed and how it works? Modified all occurrences of `server_socket.strip()` to `server_socket.strip() if server_socket else ''` in the following test files: 1. `test/integration_test/miniob/miniob_client.py` - Line 36 2. `test/integration_test/miniob/miniob_server.py` - Line 57 3. `test/integration_test/miniob_test_util.py` - Lines 129 and 391 4. `test/case/miniob_test.py` - Lines 113 and 277 This change ensures that when `server_socket` is `None`, it is safely converted to an empty string, allowing the code to fall back to TCP port mode. The existing logic already handles empty strings correctly by checking `if len(self.__server_socket) > 0` before attempting to use Unix socket. ### Other information This is a minimal fix that improves the robustness of the test framework by handling the case where Unix socket is not configured.
1 parent 707a0e0 commit 6a76770

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

test/case/miniob_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def __init__(self, base_dir: str, data_dir: str, config_file: str, server_port:
110110
self.__check_config(config_file)
111111
self.__config = config_file
112112
self.__server_port = server_port
113-
self.__server_socket = server_socket.strip()
113+
self.__server_socket = server_socket.strip() if server_socket else ''
114114

115115
self.__process = None
116116

@@ -274,7 +274,7 @@ def __init__(self, server_port: int, server_socket: str, time_limit:int = 10):
274274
raise(Exception("Invalid server port: " + str(server_port)))
275275

276276
self.__server_port = server_port
277-
self.__server_socket = server_socket.strip()
277+
self.__server_socket = server_socket.strip() if server_socket else ''
278278
self.__socket = None
279279
self.__buffer_size = 8192
280280

test/integration_test/miniob/miniob_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(self, *,
3333
self.__logger = _logger
3434

3535
self.__server_port = server_port
36-
self.__server_socket = server_socket.strip()
36+
self.__server_socket = server_socket.strip() if server_socket else ''
3737
self.__time_limit = time_limit
3838
self.__socket = None
3939
self.__buffer_size = 8192

test/integration_test/miniob/miniob_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(self, *,
5454
self.__check_config(config_file)
5555
self.__config = config_file
5656
self.__server_port = server_port
57-
self.__server_socket = server_socket.strip()
57+
self.__server_socket = server_socket.strip() if server_socket else ''
5858

5959
self.__process = None
6060
self.__core_path = core_path

test/integration_test/miniob_test_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def __init__(self, *,
126126
self.__check_config(config_file)
127127
self.__config = config_file
128128
self.__server_port = server_port
129-
self.__server_socket = server_socket.strip()
129+
self.__server_socket = server_socket.strip() if server_socket else ''
130130

131131
self.__process = None
132132
self.__core_path = core_path
@@ -388,7 +388,7 @@ def __init__(self, *,
388388
self.__logger:logging.Logger = _logger
389389

390390
self.__server_port = server_port
391-
self.__server_socket = server_socket.strip()
391+
self.__server_socket = server_socket.strip() if server_socket else ''
392392
self.__socket = None
393393
self.__buffer_size = 8192
394394

0 commit comments

Comments
 (0)