jstestnode: use XORG_LOCK_DIR

replace slapos.recipe:xvfb by a simple wrapper

software/jstestnode/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 7c907db5f803b03a218b49888a3a3799
+md5sum = 74d4c0a5105fa3d74af894fa1afa9ba2
 
 [template-nginx-service]
 filename = template-nginx-service.sh.in
@@ -27,4 +27,4 @@ md5sum = 9f22db89a2679534aa8fd37dbca86782
 
 [template-runTestSuite]
 filename = runTestSuite.in
-md5sum = af6985e2192b43b5b1dfd37bb538df72
+md5sum = d26572727ef1679a8a9e51b021ece524

software/jstestnode/instance.cfg.in

@@ -39,15 +39,19 @@ buildout-directory = $${buildout:directory}
 mode = 0700
 
 [xvfb-instance]
-recipe = slapos.cookbook:xvfb
-runner-path = $${directory:services}/xvfb
-xvfb-path = ${xserver:location}/bin/Xvfb
-fbdir-path = $${directory:framebuffer}
-tmp-path = $${directory:run}
-shell-path = ${dash:location}/bin/dash
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${directory:services}/$${:_buildout_section_name_}
+command-line =
+  ${xserver:location}/bin/Xvfb
+    $${:display}
+    -screen 0 1024x768x24
+    -fbdir $${directory:framebuffer}
+environment =
+  XORG_LOCK_DIR=$${:lock-dir}
+
+display = :0
+lock-dir = $${directory:run}
 
-xwd-path = ${xwd:location}/bin/xwd
-xwd-hook-path = $${directory:bin}/xwd
 
 #################################
 # Nginx service

software/jstestnode/runTestSuite.in

@@ -15,8 +15,8 @@ from selenium.webdriver.support import expected_conditions as EC
 from subprocess import check_output
 import json
 
-os.environ['TMPDIR'] = '$${xvfb-instance:tmp-path}'
-os.environ['DISPLAY'] = ':0'
+os.environ['XORG_LOCK_DIR'] = '$${xvfb-instance:lock-dir}'
+os.environ['DISPLAY'] = '$${xvfb-instance:display}'
 
 BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'