Skip to content

fix: avoid None.strip() error in TCP mode by checking server_socket #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hnwyllmm merged 1 commit into from
Dec 11, 2025
Merged

fix: avoid None.strip() error in TCP mode by checking server_socket #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/case/miniob_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/integration_test/miniob/miniob_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/integration_test/miniob/miniob_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration_test/miniob_test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down