Merge branch 'lighthouse-1017-patch'

Conflicts: framework/pym/play/commands/base.py
yjaigu · Aug 8, 2011 · 6fe29a6 · 6fe29a6
2 parents 6fed60e + d3987c6
commit 6fe29a6
Show file tree

Hide file tree

Showing 4 changed files with 2,357 additions and 2,337 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ framework/src/play/version
 framework/tests/test-application/db
 framework/play-*.jar
 framework/docs
+samples-and-tests/*/test-result/
 
 # IDE and editors
 *~

diff --git a/framework/pym/play/commands/base.py b/framework/pym/play/commands/base.py
@@ -232,8 +232,12 @@ def autotest(app, args):
     # Run FirePhoque
     print "~"
 
+    headless_browser = ''
+    if app.readConf('headlessBrowser'):
+        headless_browser = app.readConf('headlessBrowser')
+
     cp_args = getFirephoqueClasspath(app)
-    java_cmd = [app.java_path(), '-classpath', cp_args, '-Dapplication.url=%s://localhost:%s' % (protocol, http_port), 'play.modules.testrunner.FirePhoque']
+    java_cmd = [app.java_path(), '-classpath', cp_args, '-Dapplication.url=%s://localhost:%s' % (protocol, http_port), '-DheadlessBrowser=%s' % (headless_browser), 'play.modules.testrunner.FirePhoque']
     try:
         subprocess.call(java_cmd, env=os.environ)
     except OSError: