[Git][noosfero/noosfero][master] Always make xvfb-run choose a free DISPLAY to avoid concurrency issues

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
32f1ee4b by Antonio Terceiro at 2016-01-28T16:27:17-02:00
Always make xvfb-run choose a free DISPLAY to avoid concurrency issues

- - - - -


2 changed files:

- lib/tasks/ci.rake
- lib/tasks/plugins_tests.rake


Changes:

=====================================
lib/tasks/ci.rake
=====================================
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -57,7 +57,7 @@ namespace :ci do
 
     sh 'ruby', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
-    sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty?
+    sh 'xvfb-run', '-a', 'cucumber', '-p', 'selenium', *features unless features.empty?
 
     changed_plugins.each do |plugin|
       if $broken_plugins.include?(plugin)


=====================================
lib/tasks/plugins_tests.rake
=====================================
--- a/lib/tasks/plugins_tests.rake
+++ b/lib/tasks/plugins_tests.rake
@@ -116,7 +116,7 @@ def run_minitest files
 end
 
 def run_cucumber(profile, files)
-  sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
+  sh 'xvfb-run', '-a', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
 end
 
 def custom_run(name, files, run=:all)



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/32f1ee4be01e04ffd485022bbf3a420ded73192d
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160128/2f007464/attachment.html>