# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1329133679 -3600
# Node ID a3d3bdd464635a1533bdad4bd1444d30c4271e3d
# Parent  baf8c16cae9528496cb078225ff52268a24c81da
[devtools] Use Xvfb to run firefox in js tests on posix platforms

This way we don't require running tests under X.

diff -r baf8c16cae95 -r a3d3bdd46463 debian/control
--- a/debian/control	Mon Feb 13 12:45:21 2012 +0100
+++ b/debian/control	Mon Feb 13 12:47:59 2012 +0100
@@ -126,7 +126,7 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}, cubicweb-server (= ${source:Version}), cubicweb-web (= ${source:Version}), python-pysqlite2
-Suggests: w3c-dtd-xhtml
+Suggests: w3c-dtd-xhtml, xvfb
 Description: tests suite and development tools for the CubicWeb framework
  CubicWeb is a semantic web application framework.
  .
diff -r baf8c16cae95 -r a3d3bdd46463 devtools/qunit.py
--- a/devtools/qunit.py	Mon Feb 13 12:45:21 2012 +0100
+++ b/devtools/qunit.py	Mon Feb 13 12:47:59 2012 +0100
@@ -70,13 +70,16 @@
         fnull = open(os.devnull, 'w')
         stdout = TemporaryFile()
         stderr = TemporaryFile()
+        self.firefox_cmd = ['firefox', '-no-remote']
+        if os.name == 'posix':
+            self.firefox_cmd = ['xvfb-run', '-a'] + self.firefox_cmd
         try:
             home = osp.expanduser('~')
             user = getlogin()
             assert os.access(home, os.W_OK), \
                    'No write access to your home directory, Firefox will crash.'\
                    ' Are you sure "%s" is a valid home  for user "%s"' % (home, user)
-            check_call(['firefox', '-no-remote', '-CreateProfile',
+            check_call(self.firefox_cmd + ['-CreateProfile',
                         '%s %s' % (self._profile_name, self._tmp_dir)],
                                   stdout=stdout, stderr=stderr)
         except CalledProcessError, cpe:
@@ -87,7 +90,7 @@
     def start(self, url):
         self.stop()
         fnull = open(os.devnull, 'w')
-        self._process = Popen(['firefox', '-no-remote', '-P', self._profile_name, url],
+        self._process = Popen(self.firefox_cmd + ['-P', self._profile_name, url],
                               stdout=fnull, stderr=fnull)
 
     def stop(self):