ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix postgres file failure when running in parallel 

Change-Id: Ic24d2c8ceea89c2b7cbe2d8a792bfb3ed6fd8ab5
Reviewed-on: https://gerrit.instructure.com/11448
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
This commit is contained in:
Jake Sorce 2012-06-08 11:56:31 -06:00
parent 0821ab2903
commit 14984c9e8e
3 changed files with 32 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/tasks/parallel_exclude.rb Normal file
View File

@ -0,0 +1,25 @@
module ParallelExclude
FILES =
[
'vendor/plugins/wiziq/spec_canvas/aglive_com_util_spec.rb',
'spec/controllers/files_controller_spec.rb',
'vendor/plugins/multiple_root_accounts/spec_canvas/integration/quotas_spec.rb',
'vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb',
'vendor/plugins/multiple_root_accounts/spec_canvas/lib/shard_importer_spec.rb',
'vendor/plugins/respondus_soap_endpoint/spec_canvas/integration/respondus_endpoint_spec.rb',
'spec/apis/api_spec_helper.rb',
'spec/apis/general_api_spec.rb',
'spec/apis/user_content_spec.rb',
'spec/apis/v1/groups_api_spec.rb',
'spec/apis/v1/submissions_api_spec.rb',
'spec/integration/files_spec.rb',
'spec/lib/acts_as_list.rb',
'spec/lib/content_zipper_spec.rb',
'spec/lib/turnitin_spec.rb',
'spec/models/attachment_spec.rb',
'spec/models/course_spec.rb',
'spec/models/eportfolio_entry_spec.rb',
'spec/models/media_object_spec.rb',
'spec/models/zip_file_import_spec.rb'
]
end

25
lib/tasks/parallelized.rake
View File

@ -4,30 +4,9 @@ unless ARGV.any? { |a| a =~ /\Agems/ }
namespace :parallel do
task :nonseleniumparallel, :count do |t, args|
require "parallelized_specs"
require File.expand_path(File.dirname(__FILE__) + '/parallel_exclude')
count = args[:count]
single_thread_files =
[
'vendor/plugins/wiziq/spec_canvas/aglive_com_util_spec.rb',
'spec/controllers/files_controller_spec.rb',
'vendor/plugins/multiple_root_accounts/spec_canvas/integration/quotas_spec.rb',
'vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb',
'vendor/plugins/multiple_root_accounts/spec_canvas/lib/shard_importer_spec.rb',
'vendor/plugins/respondus_soap_endpoint/spec_canvas/integration/respondus_endpoint_spec.rb',
'spec/apis/api_spec_helper.rb',
'spec/apis/general_api_spec.rb',
'spec/apis/user_content_spec.rb',
'spec/apis/v1/groups_api_spec.rb',
'spec/apis/v1/submissions_api_spec.rb',
'spec/integration/files_spec.rb',
'spec/lib/acts_as_list.rb',
'spec/lib/content_zipper_spec.rb',
'spec/lib/turnitin_spec.rb',
'spec/models/attachment_spec.rb',
'spec/models/course_spec.rb',
'spec/models/eportfolio_entry_spec.rb',
'spec/models/media_object_spec.rb',
'spec/models/zip_file_import_spec.rb'
]
single_thread_files = ParallelExclude::FILES
test_files = FileList['vendor/plugins/*/spec_canvas/**/*_spec.rb'].exclude('vendor/plugins/*/spec_canvas/selenium/*_spec.rb') + FileList['spec/**/*_spec.rb'].exclude('spec/selenium/**/*_spec.rb')
single_thread_files.each { |filename| test_files.delete(filename) } #need to exclude these tests from running in parallel because they have dependencies that break the spces when run in parallel
test_files.map! { |f| "#{Rails.root}/#{f}" }

29
lib/tasks/rspec.rake
View File

@ -79,31 +79,12 @@ unless ARGV.any? { |a| a =~ /\Agems/ }
end
desc "Run non-selenium files in a single thread"
single_thread_files =
[
'vendor/plugins/wiziq/spec_canvas/aglive_com_util_spec.rb',
'spec/controllers/files_controller_spec.rb',
'vendor/plugins/multiple_root_accounts/spec_canvas/integration/quotas_spec.rb',
'vendor/plugins/wiziq/spec_canvas/wiziq_conference_spec.rb',
'vendor/plugins/multiple_root_accounts/spec_canvas/lib/shard_importer_spec.rb',
'vendor/plugins/respondus_soap_endpoint/spec_canvas/integration/respondus_endpoint_spec.rb',
'spec/apis/api_spec_helper.rb',
'spec/apis/general_api_spec.rb',
'spec/apis/user_content_spec.rb',
'spec/apis/v1/groups_api_spec.rb',
'spec/apis/v1/submissions_api_spec.rb',
'spec/integration/files_spec.rb',
'spec/lib/acts_as_list.rb',
'spec/lib/content_zipper_spec.rb',
'spec/lib/turnitin_spec.rb',
'spec/models/attachment_spec.rb',
'spec/models/course_spec.rb',
'spec/models/eportfolio_entry_spec.rb',
'spec/models/media_object_spec.rb',
'spec/models/zip_file_import_spec.rb'
]
Spec::Rake::SpecTask.new(:single) do |t|
t.spec_files = single_thread_files
require File.expand_path(File.dirname(__FILE__) + '/parallel_exclude')
single_thread_files = ParallelExclude::FILES
test_files = FileList['vendor/plugins/*/spec_canvas/**/*_spec.rb'].exclude('vendor/plugins/*/spec_canvas/selenium/*_spec.rb') + FileList['spec/**/*_spec.rb'].exclude('spec/selenium/**/*_spec.rb')
available_files = test_files.select { |file_name| single_thread_files.include?(file_name) }
t.spec_files = available_files
end
desc "Run all specs in spec directory with RCov (excluding plugin specs)"