Permalink
Browse files

try to fixed travis-ci timeout error.

  • Loading branch information...
1 parent 70d3438 commit 2f67605f6e55a012b63780e2f791efa5dc0c5e9e @saberma committed Apr 16, 2012
Showing with 5 additions and 3 deletions.
  1. +2 −0 .travis.yml
  2. +3 −3 Rakefile
View
@@ -20,13 +20,15 @@ env:
- UNIT_TEST=5 # 单元测试5
- UNIT_TEST=6 # 单元测试6
- UNIT_TEST=7 # 单元测试7
+ - UNIT_TEST=8 # 单元测试8
- INTEGRATE_TEST=1 # 集成测试1
- INTEGRATE_TEST=2 # 集成测试2
- INTEGRATE_TEST=3 # 集成测试3
- INTEGRATE_TEST=4 # 集成测试4
- INTEGRATE_TEST=5 # 集成测试5
- INTEGRATE_TEST=6 # 集成测试6
- INTEGRATE_TEST=7 # 集成测试7
+ - INTEGRATE_TEST=8 # 集成测试8
#notifications:
# recipients:
View
@@ -25,7 +25,7 @@ namespace :travis do
desc "Run travis in parallel"
task :parallel do
- parallel_size = 7
+ parallel_size = 8
unit_test = ENV['UNIT_TEST']
integrate_test = ENV['INTEGRATE_TEST']
all_files = Dir.chdir(Rails.root) { Dir["spec/**/*_spec.rb"]}.sort
@@ -34,9 +34,9 @@ namespace :travis do
%w(shop/shops_searches_spec.rb lookup_spec.rb).each do |searchable_spec|
integrate_files.delete "spec/requests/#{searchable_spec}" # 需要solr才能运行
end
- files = if unit_test # 7个并发
+ files = if unit_test # 8个并发
unit_files.in_groups(parallel_size)[unit_test.to_i-1].join(' ')
- elsif integrate_test # 7个并发
+ elsif integrate_test # 8个并发
integrate_files.in_groups(parallel_size)[integrate_test.to_i-1].join(' ')
end

0 comments on commit 2f67605

Please sign in to comment.