Use XORG_LOCK_DIR for Xorg lock files and sockets

The case of firefox 60 described in the commit messages showed that we should not use `$TMPDIR` instead of `/tmp` in our patch to isolate `$DISPLAY`s.

This introduce a new environment variable `XORG_LOCK_DIR` with clearer semantics.

Softwares relying on this have been updated or removed when not used.

The following softwares where already OK:
 * ERP5 and erp5testnode did not set `$TMPDIR` and were using `/tmp/`
 * cloudooo runs in `--headless` mode

/reviewed-on nexedi/slapos!394

CHANGES.rst

 Changes
 =======
 
+1.0.75-dev (unreleased)
+-----------------------
+
+* Drop ``slapos.recipe:xvfb``, use simple ``slapos.recipe:wrapper`` instead.
+* Drop ``slapos.recipe:seleniumrunner`` and ``slapos.recipe:firefox``, they
+  were not used.
+
 1.0.75 (2018-09-04)
 -------------------
 

component/xorg/buildout.cfg

@@ -17,6 +17,7 @@ extends =
   ../perl-XML-Parser/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
+  ./buildout.hash.cfg
 
 parts =
   libXdmcp
@@ -67,7 +68,7 @@ shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
 md5sum = 84c66908cf003ad8c272b0eecbdbaee3
 patches =
-  ${:_profile_base_location_}/xtrans_tmp_env.patch#37d82a3b6009113023599632117a6855
+  ${:_profile_base_location_}/xtrans_tmp_env.patch#${xtrans_tmp_env.patch:md5sum}
 patch-options = -p1
 configure-options =
   --disable-docs
@@ -109,7 +110,7 @@ shared = true
 url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
 md5sum = ed632cb0dc31b6fbd7ea5c0f931cf5a4
 patches =
-  ${:_profile_base_location_}/libxcb_tmp_env.patch#61f39878120ba434a169e24cae2af862
+  ${:_profile_base_location_}/libxcb_tmp_env.patch#${libxcb_tmp_env.patch:md5sum}
 patch-options = -p1
 configure-options =
   --disable-static
@@ -554,7 +555,7 @@ shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2
 md5sum = 791f0323b886abb7954de7f042bb7dc6
 patches =
-  ${:_profile_base_location_}/xorg-server_tmp_env.patch#8b60ab8121f0564a681fc00d03101696
+  ${:_profile_base_location_}/xorg-server_tmp_env.patch#${xorg-server_tmp_env.patch:md5sum}
 patch-options = -p1
 configure-options =
   --enable-xvfb

component/xorg/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[libxcb_tmp_env.patch]
+filename = libxcb_tmp_env.patch
+md5sum = 03bc7279f2a37bac7bf426af213123b2
+
+[xorg-server_tmp_env.patch]
+filename = xorg-server_tmp_env.patch
+md5sum = 8ab5c57af8348787c119c1bafc3b1409
+
+[xtrans_tmp_env.patch]
+filename = xtrans_tmp_env.patch
+md5sum = 3258214edaba0a52dc0c800f940a0b9f

component/xorg/libxcb_tmp_env.patch

+Store Xorg lock files and sockets in different directories
+
+see xorg-server_tmp_env.patch
+
 --- libxcb-1.7/src/xcb_util.c.back	2012-04-03 13:30:36.000000000 +0200
 +++ libxcb-1.7/src/xcb_util.c	2012-04-03 14:47:00.000000000 +0200
 @@ -147,11 +147,31 @@
@@ -30,7 +34,7 @@
 -    static const char unix_base[] = "/tmp/.X11-unix/X";
 -    const char *base = unix_base;
 +    char *base;
-+    base = _xcb_getandappendcompatibleenv("TMPDIR", "/tmp", "/.X11-unix/X");
++    base = _xcb_getandappendcompatibleenv("XORG_LOCK_DIR", "/tmp", "/.X11-unix/X");
      size_t filelen;
      char *file = NULL;
      int actual_filelen;

component/xorg/xorg-server_tmp_env.patch

+Store Xorg lock files and sockets in different directories
+
+This patch allow easy enable isolation of multiple Xorg servers and clients
+running on same machine, instead of using the convention to store sockets and
+lock files in /tmp/ store them in a directory defined in XORG_LOCK_DIR
+environment variable.
+When this environment variable is not set, fallbacks to the traditional
+behavior of using /tmp/ .
+
 --- xorg-server-1.9.3/os/utils.c.old	2012-03-29 18:20:02.000000000 +0200
 +++ xorg-server-1.9.3/os/utils.c	2012-03-29 18:39:33.000000000 +0200
 @@ -226,7 +226,26 @@ OsSignal(int sig, OsSigHandlerPtr handle
@@ -24,7 +33,7 @@
 +
 +}
 +
-+#define LOCK_DIR getcompatibleenv("TMPDIR", "/tmp")
++#define LOCK_DIR getcompatibleenv("XORG_LOCK_DIR", "/tmp")
  #define LOCK_TMP_PREFIX "/.tX"
  #define LOCK_PREFIX "/.X"
  #define LOCK_SUFFIX "-lock"

component/xorg/xtrans_tmp_env.patch

+Store Xorg lock files and sockets in different directories
+
+see xorg-server_tmp_env.patch
+
 --- xtrans-1.2.6/Xtranssock.c.old	2012-03-29 14:25:45.000000000 +0200
 +++ xtrans-1.2.6/Xtranssock.c	2012-03-29 18:40:54.000000000 +0200
 @@ -207,29 +207,49 @@ static int TRANS(SocketINETClose) (Xtran
@@ -27,38 +31,38 @@
  #if defined(X11_t)
 -#define UNIX_PATH "/tmp/.X11-unix/X"
 -#define UNIX_DIR "/tmp/.X11-unix"
-+#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.X11-unix/X")
-+#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.X11-unix")
++#define UNIX_PATH getandappendcompatibleenv(0, "XORG_LOCK_DIR", "/tmp", "/.X11-unix/X")
++#define UNIX_DIR getandappendcompatibleenv(1, "XORG_LOCK_DIR", "/tmp", "/.X11-unix")
  #endif /* X11_t */
  #if defined(XIM_t)
 -#define UNIX_PATH "/tmp/.XIM-unix/XIM"
 -#define UNIX_DIR "/tmp/.XIM-unix"
-+#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.XIM-unix/XIM")
-+#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.XIM-unix")
++#define UNIX_PATH getandappendcompatibleenv(0, "XORG_LOCK_DIR", "/tmp", "/.XIM-unix/XIM")
++#define UNIX_DIR getandappendcompatibleenv(1, "XORG_LOCK_DIR", "/tmp", "/.XIM-unix")
  #endif /* XIM_t */
  #if defined(FS_t) || defined(FONT_t)
 -#define UNIX_PATH "/tmp/.font-unix/fs"
 -#define UNIX_DIR "/tmp/.font-unix"
-+#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.font-unix/fs")
-+#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.font-unix")
++#define UNIX_PATH getandappendcompatibleenv(0, "XORG_LOCK_DIR", "/tmp", "/.font-unix/fs")
++#define UNIX_DIR getandappendcompatibleenv(1, "XORG_LOCK_DIR", "/tmp", "/.font-unix")
  #endif /* FS_t || FONT_t */
  #if defined(ICE_t)
 -#define UNIX_PATH "/tmp/.ICE-unix/"
 -#define UNIX_DIR "/tmp/.ICE-unix"
-+#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.ICE-unix/")
-+#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.ICE-unix")
++#define UNIX_PATH getandappendcompatibleenv(0, "XORG_LOCK_DIR", "/tmp", "/.ICE-unix/")
++#define UNIX_DIR getandappendcompatibleenv(1, "XORG_LOCK_DIR", "/tmp", "/.ICE-unix")
  #endif /* ICE_t */
  #if defined(TEST_t)
 -#define UNIX_PATH "/tmp/.Test-unix/test"
 -#define UNIX_DIR "/tmp/.Test-unix"
-+#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.Test-unix/test")
-+#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.Test-unix")
++#define UNIX_PATH getandappendcompatibleenv(0, "XORG_LOCK_DIR", "/tmp", "/.Test-unix/test")
++#define UNIX_DIR getandappendcompatibleenv(1, "XORG_LOCK_DIR", "/tmp", "/.Test-unix")
  #endif
  #if defined(LBXPROXY_t)
 -#define UNIX_PATH "/tmp/.X11-unix/X"
 -#define UNIX_DIR  "/tmp/.X11-unix"
-+#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.X11-unix/X")
-+#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.X11-unix")
++#define UNIX_PATH getandappendcompatibleenv(0, "XORG_LOCK_DIR", "/tmp", "/.X11-unix/X")
++#define UNIX_DIR getandappendcompatibleenv(1, "XORG_LOCK_DIR", "/tmp", "/.X11-unix")
  #endif
  
  

setup.py

@@ -103,7 +103,6 @@ setup(name=name,
           'erp5.promise = slapos.recipe.erp5_promise:Recipe',
           'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
-          'firefox = slapos.recipe.firefox:Recipe',
           'fontconfig = slapos.recipe.fontconfig:Recipe',
           'free_port = slapos.recipe.free_port:Recipe',
           'generate.mac = slapos.recipe.random:Mac',
@@ -167,7 +166,6 @@ setup(name=name,
           'slapos.recipe.request:RequestOptionalJSONEncoded',
           're6stnet.registry = slapos.recipe.re6stnet:Recipe',
           'reverseproxy.nginx = slapos.recipe.reverse_proxy_nginx:Recipe',
-          'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
           'shell = slapos.recipe.shell:Recipe',
           'shellinabox = slapos.recipe.shellinabox:Recipe',
@@ -194,7 +192,6 @@ setup(name=name,
           'userinfo = slapos.recipe.userinfo:Recipe',
           'webchecker = slapos.recipe.web_checker:Recipe',
           'wrapper = slapos.recipe.wrapper:Recipe',
-          'xvfb = slapos.recipe.xvfb:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'zimbra.kvm = slapos.recipe.zimbra_kvm:Recipe',

slapos/recipe/README.seleniumrunner.rst

-seleniumrunner
-==============
-
-Allows to run selenium tests through browser and xvfb. Posts the results on
-Nexedi ERP5.
-
-Parameters
-==========
-
-  * project : name of the project inside of ERP5 test result instance
-  * user : username to use in ERP5 instance to test
-  * password : password to use in ERP5 instance to test
-  * suite_name : name of test suite to launch 
-  * url : url to portal_test of ERP5 isntance to test
-  * test_report_instance_url : url of test_result_module to put results
-
-  * Example::
-  
-    <?xml version="1.0" encoding="utf-8"?>
-    <instance>
-    <parameter id="project">Vifib</parameter>
-    <parameter id="user">myuser</parameter>
-    <parameter id="password">mypassword</parameter>
-    <parameter id="suite_name">my_zuite</parameter>
-    <parameter id="url">https://myerp5totest/erp5/portal_tests</parameter>
-    <parameter id="test_report_instance_url">https://user:passwordwww.myerp5withtestresults.com/test_result_module/</parameter>
-    </instance>

slapos/recipe/firefox/__init__.py

-##############################################################################
-#
-# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#############################################################################
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-import sys
-
-class Recipe(GenericBaseRecipe):
-  def install(self):
-
-    prefjs = self.createFile(
-      self.options['prefsjs-path'],
-      self.substituteTemplate(self.getTemplateFilename('prefs.js'), {}))
-
-    config = {
-      'firefox_binary': self.options['firefox-path'],
-      'python_path': sys.executable,
-      'tmp_path': self.options['tmp-path'],
-      'pref_path': prefjs,
-      }
-
-    runner = self.createExecutable(
-      self.options['runner-path'],
-      self.substituteTemplate(self.getTemplateFilename('firefox_run.in'),
-                              config))
-
-    return [runner, prefjs]
-

slapos/recipe/firefox/template/firefox_run.in

-#!%(python_path)s
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-#
-
-import os
-from subprocess import Popen, PIPE
-import tempfile
-import shutil
-import sys
-import signal
-import subprocess
-import time
-
-os.environ['MOZ_NO_REMOTE'] = '1'
-os.environ['LC_ALL'] = 'C'
-os.environ['MOZ_CRASHREPORTER_DISABLE'] = '1'
-os.environ['NO_EM_RESTART'] = '1'
-os.environ['TMPDIR'] = "%(tmp_path)s"
-os.environ['DISPLAY'] = ':0'
-# XXX .Xauthority
-
-profile_path = tempfile.mkdtemp()
-shutil.copyfile('%(pref_path)s', os.path.join(profile_path, 'pref.js'))
-# os.environ['HOME'] = profile_path
-child_pg = None
-
-def sig_handler(signal, frame):
-  if child_pg is not None:
-    os.killpg(child_pg, signal.SIGHUP)
-    os.killpg(child_pg, signal.SIGTERM)
-  sys.exit(0)
-
-signal.signal(signal.SIGINT, sig_handler)
-signal.signal(signal.SIGQUIT, sig_handler)
-signal.signal(signal.SIGTERM, sig_handler)
-
-def execute_with_signal_translation(args):
-  """Run process as children and translate from SIGTERM to another signal"""
-  child = subprocess.Popen(args, close_fds=True, preexec_fn=os.setsid)
-  child_pg = child.pid
-  try:
-    while True:
-      time.sleep(2)
-  finally:
-    os.killpg(child_pg, signal.SIGHUP)
-    os.killpg(child_pg, signal.SIGTERM)
-
-try:
-  execute_with_signal_translation(
-    ["%(firefox_binary)s", "-no-remote", "-profile", profile_path] + sys.argv[1:])
-
-finally:
-  shutil.rmtree(profile_path)
-  

slapos/recipe/firefox/template/prefs.js

-// Don't ask if we want to switch default browsers
-user_pref("browser.shell.checkDefaultBrowser", false);
-user_pref("browser.startup.homepage_override.mstone", "ignore");
-
-// disable application updates
-user_pref("app.update.enabled", false)
-
-// disables the 'know your rights' button from displaying on first run
-user_pref("browser.rights.3.shown", true);
-
-// Disable pop-up blocking
-user_pref("browser.allowpopups", true);
-user_pref("dom.disable_open_during_load", false);
-user_pref("browser.tabs.warnOnClose", false);
-
-// Configure us as the local proxy
-//user_pref("network.proxy.type", 2);
-
-// Disable security warnings
-user_pref("security.warn_submit_insecure", false);
-user_pref("security.warn_submit_insecure.show_once", false);
-user_pref("security.warn_entering_secure", false);
-user_pref("security.warn_entering_secure.show_once", false);
-user_pref("security.warn_entering_weak", false);
-user_pref("security.warn_entering_weak.show_once", false);
-user_pref("security.warn_leaving_secure", false);
-user_pref("security.warn_leaving_secure.show_once", false);
-user_pref("security.warn_viewing_mixed", false);
-user_pref("security.warn_viewing_mixed.show_once", false);
-
-// Disable "do you want to remember this password?"
-user_pref("signon.rememberSignons", false);
-
-// increase the timeout before warning of unresponsive script
-user_pref("dom.max_script_run_time", 120);
-
-// this is required to upload files
-// user_pref("capability.principal.codebase.p1.granted", "UniversalFileRead");
-// user_pref("signed.applets.codebase_principal_support", true);
-// user_pref("capability.principal.codebase.p1.id", "http://");
-// user_pref("capability.principal.codebase.p1.subjectName", "");
-
-user_pref("browser.link.open_external", 3);
-user_pref("browser.link.open_newwindow", 3);
-
-// disables the request to send performance data from displaying
-user_pref("toolkit.telemetry.prompted", 2);
-user_pref("toolkit.telemetry.rejected", true);
-
-user_pref("browser.migration.version", 5);
-user_pref("extensions.SelectionUI", true);
-user_pref("network.cookie.prefsMigrated", true);
-user_pref("browser.bookmarks.restore_default_bookmarks", false);
-user_pref("browser.places.smartBookmarksVersion", 2);
-user_pref("privacy.sanitize.migrateFx3Prefs", true);

slapos/recipe/seleniumrunner/__init__.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#############################################################################
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-
-class Recipe(GenericBaseRecipe):
-
-  def install(self):
-    return self.createPythonScript(
-      self.options['runner-path'],
-      __name__+'.testrunner.run',
-      (self.options['suite-url'],
-       self.options['report-url'],
-       self.options['report-project'],
-       self.options['browser']))

slapos/recipe/seleniumrunner/erp5functionaltestreporthandler.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#############################################################################
-from __future__ import absolute_import
-
-import re
-import urlparse
-import urllib
-import httplib
-import mimetools
-from random import randint
-import tempfile
-import os
-import stat
-import zipfile
-import mimetypes
-import datetime
-
-TB_SEP = "============================================================="\
-    "========="
-
-# REGEX FOR ZELENIUM TESTS
-TEST_PASS_RE = re.compile('<th[^>]*>Tests passed</th>\n\s*<td[^>]*>([^<]*)')
-TEST_FAILURE_RE = re.compile('<th[^>]*>Tests failed</th>\n\s*<td[^>]*>([^<]*)')
-IMAGE_RE = re.compile('<img[^>]*?>')
-TEST_ERROR_TITLE_RE = re.compile('(?:error.gif.*?>|title status_failed"><td[^>]*>)([^>]*?)</td></tr>', re.S)
-TEST_RESULT_RE = re.compile('<div style="padding-top: 10px;">\s*<p>\s*'
-                          '<img.*?</div>\s.*?</div>\s*', re.S)
-DURATION_RE = re.compile('<th[^>]*>Elapsed time \(sec\)</th>\n\s*<td[^>]*>([^<]*)')
-
-TEST_ERROR_RESULT_RE = re.compile('.*(?:error.gif|title status_failed).*', re.S)
-
-def get_content_type(f):
-  return mimetypes.guess_type(f.name)[0] or 'application/octet-stream'
-
-class ConnectionHelper:
-  def __init__(self, url):
-    self.conn = urlparse.urlparse(url)
-    if self.conn.scheme == 'http':
-      connection_type = httplib.HTTPConnection
-      if self.conn.port is None:
-        self.port = 80
-    else:
-      connection_type = httplib.HTTPSConnection
-      if self.conn.port is None:
-        self.port = 443
-    self.connection_type = connection_type
-
-  def _connect(self):
-    self.connection = self.connection_type(self.conn.hostname + ':' +
-        str(self.conn.port or self.port))
-
-  def POST(self, path, parameter_dict, file_list=None):
-    self._connect()
-    parameter_dict.update(__ac_name=self.conn.username,
-                          __ac_password=self.conn.password)
-    header_dict = {'Content-type': "application/x-www-form-urlencoded"}
-    if file_list is None:
-      body = urllib.urlencode(parameter_dict)
-    else:
-      boundary = mimetools.choose_boundary()
-      header_dict['Content-type'] = 'multipart/form-data; boundary=%s' % (
-          boundary,)
-      body = ''
-      for k, v in parameter_dict.iteritems():
-        body += '--%s\r\n' % boundary
-        body += 'Content-Disposition: form-data; name="%s"\r\n' % k
-        body += '\r\n'
-        body += '%s\r\n' % v
-      for name, filename in file_list:
-        f = open(filename, 'r')
-        body += '--%s\r\n' % boundary
-        body += 'Content-Disposition: form-data; name="%s"; filename="%s"\r\n'\
-                % (name, name)
-        body += 'Content-Type: %s\r\n' % get_content_type(f)
-        body += 'Content-Length: %d\r\n' % os.fstat(f.fileno())[stat.ST_SIZE]
-        body += '\r\n'
-        body += f.read()
-        f.close()
-        body += '\r\n'
-    self.connection.request("POST", self.conn.path + '/' + path,
-          body, header_dict)
-    self.response = self.connection.getresponse()
-
-
-class ERP5TestReportHandler:
-  def __init__(self, url, suite_name):
-    # random test id
-    self.test_id = "%s-%X" % (
-       ("%s" % datetime.date.today()).replace("-", ""),
-       randint(1, 10000000000000000),
-     )
-    self.connection_helper = ConnectionHelper(url)
-    self.suite_name = suite_name
-
-  def reportStart(self):
-    # report that test is running
-    print 'Starting test with id %s' % self.test_id
-    self.connection_helper.POST('TestResultModule_reportRunning', dict(
-      test_suite=self.suite_name,
-      test_report_id=self.test_id,
-      ))
-
-  def reportFinished(self, out_file):
-    # make file parsable by erp5_test_results
-    out_file, success, failure, duration = self.processResult(out_file)
-
-    # XXX-Cedric : make correct display in test_result_module
-    tempcmd = tempfile.mkstemp()[1]
-    tempcmd2 = tempfile.mkstemp()[1]
-    tempout = tempfile.mkstemp()[1]
-    templog = tempfile.mkstemp()[1]
-    tl = open(templog, 'w')
-    tl.write(TB_SEP + '\n')
-    tl.write(out_file)
-
-    tl.write("----------------------------------------------------------------------\n")
-    tl.write('Ran 1 test in %.2fs\n' % duration)
-    if success:
-      tl.write('OK\n')
-    else:
-      tl.write('FAILED (failures=1)\n')
-    tl.write(TB_SEP + '\n')
-    tl.close()
-    open(tempcmd, 'w').write(""" %s""" % self.suite_name)
-    # create nice zip archive
-    tempzip = tempfile.mkstemp()[1]
-    # XXX-Cedric : support multiple tests
-    zip = zipfile.ZipFile(tempzip, 'w')
-    zip.write(tempout, '%s/001/stdout' % self.suite_name)
-    zip.write(templog, '%s/001/stderr' % self.suite_name)
-    zip.write(tempcmd, '%s/001/cmdline' % self.suite_name)
-    zip.close()
-    os.unlink(templog)
-    os.unlink(tempcmd)
-    os.unlink(tempout)
-    os.unlink(tempcmd2)
-
-    # post it to ERP5
-    self.connection_helper.POST('TestResultModule_reportCompleted',
-        dict(test_report_id=self.test_id), file_list=[('filepath', tempzip)])
-    os.unlink(tempzip)
-
-  def processResult(self, out_file):
-    file_content = out_file
-    sucess_amount = TEST_PASS_RE.search(file_content).group(1)
-    failure_amount = TEST_FAILURE_RE.search(file_content).group(1)
-    error_title_list = [re.compile('\s+').sub(' ', x).strip()
-                    for x in TEST_ERROR_TITLE_RE.findall(file_content)]
-    duration = DURATION_RE.search(file_content).group(1)
-    detail = ''
-    for test_result in TEST_RESULT_RE.findall(file_content):
-      if  TEST_ERROR_RESULT_RE.match(test_result):
-        detail += test_result
-
-    detail = IMAGE_RE.sub('', detail)
-    if detail:
-      detail = IMAGE_RE.sub('', detail)
-      detail = '''<html>
-<head>
- <style type="text/css">tr.status_failed { background-color:red };</style>
-</head>
-<body>%s</body>
-</html>''' % detail
-    return detail, int(sucess_amount), int(failure_amount), float(duration)

slapos/recipe/seleniumrunner/template/xvfb_run.in

-#!/bin/sh
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-
-%(xvfb_binary) :%(display) -screen %(display) 1024x768x24
\ No newline at end of file

slapos/recipe/seleniumrunner/testrunner.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#############################################################################
-
-from datetime import datetime
-from erp5functionaltestreporthandler import ERP5TestReportHandler
-from ERP5TypeFunctionalTestCase import TimeoutError
-from time import sleep
-import time
-import os
-import urllib2
-import urlparse
-from subprocess import Popen, PIPE
-import signal
-
-def run(suite_url, report_url, project, browser_binary):
-  suite_parsed = urlparse.urlparse(suite_url)
-
-  config = {
-    'suite_name': suite_parsed.path.split('/')[-1],
-    'base_url': "%s://%s%s" % (suite_parsed.scheme, suite_parsed.hostname,
-                               '/'.join(suite_parsed.path.split('/')[:-1])),
-    'user': suite_parsed.username,
-    'password': suite_parsed.password,
-    }
-
-  test_url = assembleTestUrl(config['base_url'], config['suite_name'],
-      config['user'], config['password'])
-
-  # There is no test that can take more them 24 hours
-  timeout = 2.0 * 60 * 60
-
-  while True:
-    erp5_report = ERP5TestReportHandler(report_url,
-        project + '@' + config['suite_name'])
-    try:
-      try:
-        start = time.time()
-        print("Running test on: %s" % test_url)
-        process = Popen('%s "%s"' % (browser_binary, test_url),
-                        stdout=PIPE,
-                        stderr=PIPE,
-                        shell=True,
-                        close_fds=True)
-        erp5_report.reportStart()
-        while not isTestFinished(config['base_url']):
-          time.sleep(10)
-          print("Test not finished yet.")
-          if (time.time() - start) > float(timeout):
-            raise TimeoutError("Test took more than %s seconds" % timeout)
-      except TimeoutError:
-        continue
-      finally:
-        if process.pid:
-          os.kill(process.pid, signal.SIGTERM)
-      print("Test has finished and Firefox has been killed.")
-
-      erp5_report.reportFinished(getStatus(config['base_url']).encode("utf-8",
-          "replace"))
-
-
-      print("Test finished and report sent, sleeping.")
-    except urllib2.URLError, urlError:
-        print "Error: %s" % urlError.msg
-    sleep(3600)
-
-def openUrl(url):
-    # Send Accept-Charset headers to activate the UnicodeConflictResolver
-    # (imitating firefox 3.5.9 here)
-    headers = { 'Accept-Charset' : 'ISO-8859-1,utf-8;q=0.7,*;q=0.7' }
-    request = urllib2.Request(url, headers=headers)
-    # Try to use long timeout, this is needed when there is many
-    # activities runing
-    try:
-      f = urllib2.urlopen(request, timeout=3600*4)
-    except TypeError:
-      f = urllib2.urlopen(request)
-    file_content = f.read()
-    f.close()
-    return file_content
-
-def isTestFinished(url):
-  """Fetch latest report. If report has been created less than 60 seconds ago,
-  it must be the current one.
-  Return true if test is finished, else return false.
-  """
-  latest_report = openUrl('%s/portal_tests/TestTool_getLatestReportId/' % url)
-  if latest_report is '':
-    return False
-  latest_report_date = latest_report[7:]
-  time_delta = datetime.now() - \
-      datetime.strptime(latest_report_date, '%Y%m%d_%H%M%S' )
-  if time_delta.days is not 0:
-    return False
-  if time_delta.seconds < 120:
-    return True
-  return False
-
-def getStatus(url):
-    try:
-      # Try 5 times.
-      for i in range(5):
-        try:
-          status = openUrl('%s/portal_tests/TestTool_getResults/' % (url))
-          break
-        except urllib2.URLError, urlError:
-          if i is 4: raise
-          print("Warning : %s while getting status" % urlError.msg)
-    except urllib2.HTTPError, e:
-      if e.msg == "No Content":
-        status = ""
-      else:
-        raise
-    return status
-
-def assembleTestUrl(base_url, suite_name, user, password):
-      """
-      Create the full url to the testrunner
-      """
-      test_url = "%s/%s/core/TestRunner.html?test=../test_suite_html&"\
-          "resultsUrl=%s/postResults&auto=on&__ac_name=%s&__ac_password=%s" % (
-          base_url, suite_name, base_url, user, password)
-      return test_url

slapos/recipe/xvfb/__init__.py

-##############################################################################
-#
-# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#############################################################################
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-
-class Recipe(GenericBaseRecipe):
-  def install(self):
-
-    config = {
-      'xvfb_binary': self.options['xvfb-path'],
-      'shell_path': self.options['shell-path'],
-      'fbdir_path': self.options['fbdir-path'],
-      'tmp_path': self.options['tmp-path'],
-      }
-
-    xvfb_path = self.createExecutable(
-      self.options['runner-path'],
-      self.substituteTemplate(self.getTemplateFilename('xvfb_run.in'),
-                              config))
-    result = [xvfb_path]
-
-    # Allow to take screenshot if needed
-    if ('xwd-path' in self.options) and ('xwd-hook-path' in self.options):
-
-      config['xwd_binary'] = self.options['xwd-path']
-      result.append(self.createExecutable(
-        self.options['xwd-hook-path'],
-        self.substituteTemplate(self.getTemplateFilename('xwd_run.in'),
-                                config)))
-
-    return result
-

slapos/recipe/xvfb/template/xvfb_run.in

-#!%(shell_path)s
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-
-export TMPDIR=%(tmp_path)s 
-exec %(xvfb_binary)s -screen 0 1024x768x24 -fbdir %(fbdir_path)s

slapos/recipe/xvfb/template/xwd_run.in

-#!%(shell_path)s
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-
-export DISPLAY=:0
-export TMPDIR=%(tmp_path)s 
-exec %(xwd_binary)s -root -out $1

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 6ec2461e884761c56ef4ba928a8eede6
+md5sum = 31ed5c856ce2dff0305d7029caefc3f6

software/cloudooo/instance-cloudooo.cfg.in

@@ -271,17 +271,23 @@ var = ${buildout:directory}/var
 framebuffer = ${:srv}/framebuffer
 
 [xvfb-instance]
-recipe = slapos.cookbook:xvfb
-runner-path = ${directory:services}/xvfb
-xvfb-path = {{ parameter_dict["xserver"] }}/bin/Xvfb
-fbdir-path = ${directory:framebuffer}
-tmp-path = ${directory:run}
-shell-path = {{ parameter_dict["dash"] }}/bin/dash
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:services}/${:_buildout_section_name_}
+command-line =
+  {{ parameter_dict["xserver"] }}/bin/Xvfb
+    ${:display}
+    -screen 0 1024x768x24
+    -fbdir ${directory:framebuffer}
+environment =
+  XORG_LOCK_DIR=${:lock-dir}
+
+display = :0
+lock-dir = ${directory:run}
 
 [wkhtmltopdf-on-xvfb]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/wkhtmltopdf
 environment =
-  DISPLAY=:0
-  TMPDIR=${directory:run}
+  DISPLAY=${xvfb-instance:display}
+  XORG_LOCK_DIR=${xvfb-instance:lock-dir}
 command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver

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}/'
 

software/seleniumrunner/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 9b6648b8f37baa3f7a6bfb68d4426049
+md5sum = 8f06bef6ed0737afa7916bc5ac7db537

software/seleniumrunner/instance-selenium.cfg.in

@@ -6,33 +6,6 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory} 
 offline = true
 
-[selenium-instance]
-recipe = slapos.cookbook:seleniumrunner
-runner-path = $${basedirectory:services}/selenium-runner
-browser = $${firefox-instance:runner-path}
-suite-url = $${slap-parameter:suite-url}
-report-url = $${slap-parameter:report-url}
-report-project = $${slap-parameter:report-project}
-
-[firefox-instance]
-recipe = slapos.cookbook:firefox
-runner-path = $${rootdirectory:bin}/firefox-sandboxed
-firefox-path = ${firefox-wrapper:location}
-prefsjs-path = $${rootdirectory:etc}/prefs.js
-shell-path = ${dash:location}/bin/dash
-tmp-path = $${xvfb-instance:tmp-path}
-
-[xvfb-instance]
-recipe = slapos.cookbook:xvfb
-runner-path = $${basedirectory:services}/xvfb
-xvfb-path = ${xserver:location}/bin/Xvfb
-fbdir-path = $${basedirectory:framebuffer}
-tmp-path = $${basedirectory:run}
-shell-path = ${dash:location}/bin/dash
-
-xwd-path = ${xwd:location}/bin/xwd
-xwd-hook-path = $${rootdirectory:bin}/xwd
-
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc