v-and-v/testium
2
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 7 Wiki Activity

debug py_func and rpc srv

Browse Source
This commit is contained in:
Foué
2026-01-03 12:03:42 +01:00
parent fd1e602960
commit 487156785a
8 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testium/interpreter/process.py
View File

@@ -88,10 +88,10 @@ class TestProcess(Process):
test_set.report_path = locate_report_file(test_set.report_path)
# Python & lua functions call subprocess initialization
py_fproc = py_func_call_init(tm.gd("python_path", ""), api_request)
py_fproc = py_func_call_init(tm.gd("python_path", ""), api_request, 10)
lua_fproc = None
if test_set.isTestTypePresent(cst_type.TYPE_LUA_FUNCTION):
lua_fproc = lua_func_call_init(tm.gd("lua_path", ""), api_request)
lua_fproc = lua_func_call_init(tm.gd("lua_path", ""), api_request, 10)
self.__loaded = True

29
src/testium/interpreter/utils/jrpc.py
View File

@@ -321,26 +321,23 @@ class JsonRpcSrv(JsonRpcBase):
# Link of the socket at the configured port
sock.bind((self._host, self._port))
sock.settimeout(self._timeout)
# Listens incoming connections
sock.listen(1)
self.print_info(f"listening on {self._host}:{self._port}")
self.print_info("awaiting connection")
self.print_info(f"awaiting connection for {self._timeout} secs")
tslice = 0.2
sock.settimeout(tslice)
t = self._timeout
while True:
try:
conn, addr = sock.accept()
self.print_info("Client connected")
except socket.timeout:
if t >= 0:
sleep(tslice)
continue
else:
raise ETUMRuntimeError(f"{self.name}: Timeout")
break
except socket.timeout:
t -= tslice
if t < 0:
raise ETUMRuntimeError(f"{self.name}: Timeout")
self.print_info("Client connected")
with conn:
@@ -380,12 +377,20 @@ class JsonRpcClient(JsonRpcBase):
# TCP/IP socket creation
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
sock.settimeout(self._timeout)
tslice = 0.5
t = self._timeout
sock.settimeout(tslice)
# Link of the socket at the configured port
while True:
try:
sock.connect((self._host, self._port))
except OSError:
raise ETUMRuntimeError(f"{self.name}: failed to connect")
break
except OSError as e:
t -= tslice
if t < 0:
raise ETUMRuntimeError(f"{self.name}: failed to connect : {e}")
else:
sleep(tslice)
self.print_info("Connected to server")
self.connect(sock)

9
src/testium/interpreter/utils/lua_func_exec.py
View File

@@ -11,9 +11,9 @@ from interpreter.test_items.test_result import TestValue
function_call_process = None
def lua_func_call_init(lua_path, request_handler):
def lua_func_call_init(lua_path, request_handler, timeout):
global function_call_process
function_call_process = LuaFuncExecEngine(lua_path, request_handler)
function_call_process = LuaFuncExecEngine(lua_path, request_handler, timeout)
return function_call_process
@@ -33,7 +33,7 @@ def is_lua_interpreter(path: str, timeout=2) -> bool:
class LuaFuncExecEngine:
def __init__(self, lua_path="", request_handler=None):
def __init__(self, lua_path="", request_handler=None, timeout=10):
if lua_path != "":
if shutil.which(lua_path) is None:
raise ETUMRuntimeError(
@@ -56,6 +56,7 @@ class LuaFuncExecEngine:
self._req_handler = request_handler
self._process = None
self._port = 0
self._timeout = timeout
self._rpc = None
def start(self):
@@ -74,7 +75,7 @@ class LuaFuncExecEngine:
lua_env = tm.gd("lua_env", {})
tm.print_debug(f"lua_env : {lua_env}")
params = [self._lpath, "main.lua", "--timeout", "10", "--host", "127.0.0.1", "--port", f"{self._port}"]
params = [self._lpath, "main.lua", "--timeout", f"{self._timeout}", "--host", "127.0.0.1", "--port", f"{self._port}"]
if tm.debug_enabled():
params.append("--verbose")

6
src/testium/interpreter/utils/paths.py
View File

@@ -63,7 +63,7 @@ def _python_version(path: str):
def _lua_version(path: str):
cmd = f'"{path}" -v"'
cmd = f'"{path}" -v'
try:
result = subprocess.run(
cmd,
@@ -79,9 +79,11 @@ def _lua_version(path: str):
data = ""
try:
vers = ((data.split(" "))[1]).split(".")
if len(vers) != 3:
vers = (0,0,0)
except:
vers = (0,0,0)
return (vers[0], vers[1], vers[2])
return tuple(vers)
def is_python3(python_path):

9
src/testium/interpreter/utils/py_func_exec.py
View File

@@ -11,9 +11,9 @@ from interpreter.test_items.test_result import TestValue
function_call_process = None
def py_func_call_init(python_path, request_handler):
def py_func_call_init(python_path, request_handler, timeout):
global function_call_process
function_call_process = PyFuncExecEngine(python_path, request_handler)
function_call_process = PyFuncExecEngine(python_path, request_handler, timeout)
return function_call_process
@@ -33,7 +33,7 @@ def is_python_interpreter(path: str, timeout=2) -> bool:
class PyFuncExecEngine:
def __init__(self, python_path="", request_handler=None):
def __init__(self, python_path="", request_handler=None, timeout=10):
if python_path != "":
if shutil.which(python_path) is None:
@@ -58,6 +58,7 @@ class PyFuncExecEngine:
self._req_handler = request_handler
self._process = None
self._port = 0
self._timeout = timeout
self._rpc = None
def start(self):
@@ -74,7 +75,7 @@ class PyFuncExecEngine:
func_proc_path = tm.gd("testium_path")
params = [self._ppath, "-m", "py_func", "-p", f"{self._port}"]
params = [self._ppath, "-m", "py_func", "-p", f"{self._port}", "-t", f"{self._timeout}"]
if tm.debug_enabled():
params.append("-v")

2
src/testium/lua_func/main.lua
View File

@@ -74,7 +74,7 @@ end
server_sock:listen(1)
local ip, port = server_sock:getsockname()
utils.log("listening on %s:%d", ip, port)
utils.log("listening on %s:%d for %.1f secs", ip, port, config.timeout)
server_sock:settimeout(config.timeout) -- Prevents hanging on dead connections

6
src/testium/py_func/__init__.py
View File

@@ -26,15 +26,19 @@ def main():
default="localhost")
parser.add_argument("-p", "--port", type=int, help="port to listen to",
default=9000)
parser.add_argument("-t", "--timeout", type=float, help="Timeout waiting for connection",
default=10)
parser.add_argument("-v", "--verbose", action='store_true', help="port to listen to")
args = parser.parse_args()
thrd_api = _init_api(args.ip, args.port)
thrd_api = _init_api(args.ip, args.port, args.timeout)
# redirect I/O
outstream = TcpStdOut()
stdio_redir.redirect(outstream)
# debug the server
if args.verbose:
thrd_api.dbg_out = stdio_redir.ini_stdout
thrd_api.start()
try:
while thrd_api.is_alive():
thrd_api.join(1)

6
src/testium/py_func/tm.py
View File

@@ -49,7 +49,7 @@ def _make_api(name):
for k in SUPPORTED_API:
setattr(thismodule, k, _make_api(k))
def _init_api(host, port):
def _init_api(host, port, timeout):
"""Start and initialize the remote function handler.
Starts a ``FuncHandler`` bound to ``port``, runs it and blocks until
@@ -63,9 +63,7 @@ def _init_api(host, port):
``_func_call_thread``.
"""
global _func_call_thread
_func_call_thread = FuncHandler(host, port)
_func_call_thread.start()
_func_call_thread.wait_ready()
_func_call_thread = FuncHandler(host, port, timeout=timeout)
return _func_call_thread