From f2dc24bb6e49b06a97c04238ef01ed6b775309de Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Wed, 25 Dec 2024 09:46:00 +0700 Subject: [PATCH 1/2] Docker: Process of xvfb_vnc_novnc start by env variable Signed-off-by: Viet Nguyen Duc --- NodeBase/selenium.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/NodeBase/selenium.conf b/NodeBase/selenium.conf index 77bc5f82c..7d8dfe9af 100644 --- a/NodeBase/selenium.conf +++ b/NodeBase/selenium.conf @@ -5,8 +5,8 @@ [program:xvfb] priority=0 command=/opt/bin/start-xvfb.sh -autostart=true -autorestart=true +autostart=%(ENV_SE_START_XVFB)s +autorestart=%(ENV_SE_START_XVFB)s killasgroup=true ;Logs @@ -23,8 +23,8 @@ stderr_capture_maxbytes=50MB [program:vnc] priority=5 command=/opt/bin/start-vnc.sh -autostart=true -autorestart=true +autostart=%(ENV_SE_START_VNC)s +autorestart=%(ENV_SE_START_VNC)s killasgroup=true ;Logs @@ -41,8 +41,8 @@ stderr_capture_maxbytes=50MB [program:novnc] priority=10 command=/opt/bin/start-novnc.sh -autostart=true -autorestart=true +autostart=%(ENV_SE_START_NO_VNC)s +autorestart=%(ENV_SE_START_NO_VNC)s killasgroup=true ;Logs From a944d74a038f02f4a0e411c4a6b82c4d71ca1a34 Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Wed, 25 Dec 2024 14:05:06 +0700 Subject: [PATCH 2/2] Update test autoscaling Signed-off-by: Viet Nguyen Duc --- tests/AutoscalingTests/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/AutoscalingTests/common.py b/tests/AutoscalingTests/common.py index 28dd18208..b178d0c10 100644 --- a/tests/AutoscalingTests/common.py +++ b/tests/AutoscalingTests/common.py @@ -79,7 +79,8 @@ def randomly_quit_sessions(sessions, sublist_size): session.quit() sessions.remove(session) print(f"QUIT: {len(sessions_to_quit)} sessions have been randomly quit.") - return len(sessions_to_quit) + return len(sessions_to_quit) + return 0 def get_result_file_name(): return f"tests/autoscaling_results"