Download as
Browse Code »

Commit 32f1ee4be01e04ffd485022bbf3a420ded73192d

Authored by Antonio Terceiro
1 parent 323089c4
Exists in staging and in 37 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

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 57  
58 58 sh 'ruby', '-Itest', *tests unless tests.empty?
59 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 62 changed_plugins.each do |plugin|
63 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 116 end
117 117  
118 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 120 end
121 121  
122 122 def custom_run(name, files, run=:all)
... ...