Skip to content

Commit 990e490

Browse files
author
Bryan Madsen
committed
use parallel_tests-instructure and remove custom loggers
Change-Id: Id71849f40ae94fa073d235e178a5497284a8e3ed Reviewed-on: https://gerrit.instructure.com/8362 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Brian Palmer <brianp@instructure.com>
1 parent 4c3602c commit 990e490

5 files changed

Lines changed: 4 additions & 150 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ end
6666
group :test do
6767
gem 'barista', '1.2.1'
6868
gem 'bluecloth', '2.0.10' # for generating api docs
69-
gem 'parallel_tests', '0.6.11'
69+
gem 'parallel_tests-instructure', '0.6.17'
7070
gem 'mocha', '0.10.0'
7171
gem 'rcov', '0.9.9'
7272
gem 'rspec', '1.3.2'

script/spec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ else
77
require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
88
end
99
require 'spec/autorun'
10-
require 'vendor/plugins/parallel_tests/spec_error_logger.rb' if ENV['TEST_ENV_NUMBER'] != nil
11-
require 'vendor/plugins/parallel_tests/spec_error_count_logger.rb' if ENV['TEST_ENV_NUMBER'] != nil
10+
require 'parallel_specs/spec_error_logger'
11+
require 'parallel_specs/spec_error_count_logger'
12+
require 'parallel_specs/spec_start_finish_logger'
1213
exit ::Spec::Runner::CommandLine.run

vendor/plugins/parallel_tests/spec_error_count_logger.rb

Lines changed: 0 additions & 30 deletions
This file was deleted.

vendor/plugins/parallel_tests/spec_error_logger.rb

Lines changed: 0 additions & 45 deletions
This file was deleted.

vendor/plugins/parallel_tests/spec_logger_base.rb

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)