Skip to content

Commit cfcbf9c

Browse files
authored
Docker: Process of xvfb_vnc_novnc start by env variable (#2534)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent d4ed4ef commit cfcbf9c

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

NodeBase/selenium.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[program:xvfb]
66
priority=0
77
command=/opt/bin/start-xvfb.sh
8-
autostart=true
9-
autorestart=true
8+
autostart=%(ENV_SE_START_XVFB)s
9+
autorestart=%(ENV_SE_START_XVFB)s
1010
killasgroup=true
1111

1212
;Logs
@@ -23,8 +23,8 @@ stderr_capture_maxbytes=50MB
2323
[program:vnc]
2424
priority=5
2525
command=/opt/bin/start-vnc.sh
26-
autostart=true
27-
autorestart=true
26+
autostart=%(ENV_SE_START_VNC)s
27+
autorestart=%(ENV_SE_START_VNC)s
2828
killasgroup=true
2929

3030
;Logs
@@ -41,8 +41,8 @@ stderr_capture_maxbytes=50MB
4141
[program:novnc]
4242
priority=10
4343
command=/opt/bin/start-novnc.sh
44-
autostart=true
45-
autorestart=true
44+
autostart=%(ENV_SE_START_NO_VNC)s
45+
autorestart=%(ENV_SE_START_NO_VNC)s
4646
killasgroup=true
4747

4848
;Logs

tests/AutoscalingTests/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ def randomly_quit_sessions(sessions, sublist_size):
7979
session.quit()
8080
sessions.remove(session)
8181
print(f"QUIT: {len(sessions_to_quit)} sessions have been randomly quit.")
82-
return len(sessions_to_quit)
82+
return len(sessions_to_quit)
83+
return 0
8384

8485
def get_result_file_name():
8586
return f"tests/autoscaling_results"

0 commit comments

Comments
 (0)