Download as
Browse Code »

Commit 32f1ee4be01e04ffd485022bbf3a420ded73192d

Authored by Antonio Terceiro
1 parent 323089c4
Exists in master and in 15 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements

Always make xvfb-run choose a free DISPLAY to avoid concurrency issues

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
lib/tasks/ci.rake
  Diff comments   View file @32f1ee4
@@ -57,7 +57,7 @@ namespace :ci do @@ -57,7 +57,7 @@ namespace :ci do
57 57
58 sh 'ruby', '-Itest', *tests unless tests.empty? 58 sh 'ruby', '-Itest', *tests unless tests.empty?
59 sh 'cucumber', *features unless features.empty? 59 sh 'cucumber', *features unless features.empty?
60 - sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty? 60 + sh 'xvfb-run', '-a', 'cucumber', '-p', 'selenium', *features unless features.empty?
61 61
62 changed_plugins.each do |plugin| 62 changed_plugins.each do |plugin|
63 if $broken_plugins.include?(plugin) 63 if $broken_plugins.include?(plugin)
lib/tasks/plugins_tests.rake
  Diff comments   View file @32f1ee4
@@ -116,7 +116,7 @@ def run_minitest files @@ -116,7 +116,7 @@ def run_minitest files
116 end 116 end
117 117
118 def run_cucumber(profile, files) 118 def run_cucumber(profile, files)
119 - sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files 119 + sh 'xvfb-run', '-a', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
120 end 120 end
121 121
122 def custom_run(name, files, run=:all) 122 def custom_run(name, files, run=:all)