Commit a1df3059 authored by Jérome Perrin's avatar Jérome Perrin

jstestnode: fix regression from introduction of Xvfb promise

${xvfb-instance:display} is used in in runTestSuite.in
parent 2fdbb0df
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 42e7d1825f5582fbe2c55977e5abc574 md5sum = ab08e75c26d06d95674042d4a2934716
[template-nginx-service] [template-nginx-service]
filename = template-nginx-service.sh.in filename = template-nginx-service.sh.in
......
...@@ -53,19 +53,20 @@ recipe = slapos.cookbook:wrapper ...@@ -53,19 +53,20 @@ recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:services}/$${:_buildout_section_name_} wrapper-path = $${directory:services}/$${:_buildout_section_name_}
command-line = command-line =
${xserver:location}/bin/Xvfb ${xserver:location}/bin/Xvfb
:$${:display} $${:display}
-screen 0 1024x768x24 -screen 0 1024x768x24
-fbdir $${directory:framebuffer} -fbdir $${directory:framebuffer}
environment = environment =
XORG_LOCK_DIR=$${:lock-dir} XORG_LOCK_DIR=$${:lock-dir}
display = 0 display = :$${:display-number}
display-number = 0
lock-dir = $${directory:run} lock-dir = $${directory:run}
[xvfb-promise] [xvfb-promise]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:promise}/$${:_buildout_section_name_} wrapper-path = $${directory:promise}/$${:_buildout_section_name_}
command-line = bash -c "[ -S $${xvfb-instance:lock-dir}/.X11-unix/X$${xvfb-instance:display} ]" command-line = bash -c "[ -S $${xvfb-instance:lock-dir}/.X11-unix/X$${xvfb-instance:display-number} ]"
################################# #################################
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment