Skip to content

Commit f6c1fdb

Browse files
committed
Removed the "CI Reporter" integration from test Rake tasks
The integration is failing, so let's first remove it and figure out later how to generate code statistics for test runs.
1 parent eb9ef48 commit f6c1fdb

File tree

4 files changed

+0
-44
lines changed

4 files changed

+0
-44
lines changed

Rakefile

-16
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ namespace :test do
5656

5757
desc "Run unit tests in all subprojects"
5858
task :unit do
59-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
6059
subprojects.each do |project|
6160
puts '-'*80
6261
sh "cd #{__current__.join(project)} && unset BUNDLE_GEMFILE && bundle exec rake test:unit"
@@ -66,8 +65,6 @@ namespace :test do
6665

6766
desc "Run integration tests in all subprojects"
6867
task :integration do
69-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
70-
7168
# 1/ elasticsearch-model
7269
#
7370
puts '-'*80
@@ -93,23 +90,10 @@ namespace :test do
9390

9491
desc "Run all tests in all subprojects"
9592
task :all do
96-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
97-
9893
Rake::Task['test:unit'].invoke
9994
Rake::Task['test:integration'].invoke
10095
end
10196

102-
task :ci_reporter do
103-
ENV['CI_REPORTS'] ||= 'tmp/reports'
104-
if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
105-
require 'ci/reporter/rake/test_unit'
106-
Rake::Task['ci:setup:testunit'].invoke
107-
else
108-
require 'ci/reporter/rake/minitest'
109-
Rake::Task['ci:setup:minitest'].invoke
110-
end
111-
end
112-
11397
namespace :cluster do
11498
desc "Start Elasticsearch nodes for tests"
11599
task :start do

elasticsearch-model/Rakefile

-10
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,14 @@ end
1717

1818
require 'rake/testtask'
1919
namespace :test do
20-
task :ci_reporter do
21-
ENV['CI_REPORTS'] ||= 'tmp/reports'
22-
require 'ci/reporter/rake/minitest'
23-
Rake::Task['ci:setup:minitest'].invoke
24-
end
25-
2620
Rake::TestTask.new(:run_unit) do |test|
27-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
2821
test.libs << 'lib' << 'test'
2922
test.test_files = FileList["test/unit/**/*_test.rb"]
3023
test.verbose = false
3124
test.warning = false
3225
end
3326

3427
Rake::TestTask.new(:run_integration) do |test|
35-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
3628
test.libs << 'lib' << 'test'
3729
test.test_files = FileList["test/integration/**/*_test.rb"]
3830
test.verbose = false
@@ -55,8 +47,6 @@ namespace :test do
5547

5648
desc "Run unit and integration tests"
5749
task :all do
58-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
59-
6050
Rake::Task['test:unit'].invoke
6151
Rake::Task['test:integration'].invoke
6252
end

elasticsearch-persistence/Rakefile

-9
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,21 @@ task :test => 'test:unit'
88

99
require 'rake/testtask'
1010
namespace :test do
11-
task :ci_reporter do
12-
ENV['CI_REPORTS'] ||= 'tmp/reports'
13-
require 'ci/reporter/rake/minitest'
14-
Rake::Task['ci:setup:minitest'].invoke
15-
end
16-
1711
Rake::TestTask.new(:unit) do |test|
18-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
1912
test.libs << 'lib' << 'test'
2013
test.test_files = FileList["test/unit/**/*_test.rb"]
2114
test.verbose = false
2215
test.warning = false
2316
end
2417

2518
Rake::TestTask.new(:integration) do |test|
26-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
2719
test.libs << 'lib' << 'test'
2820
test.test_files = FileList["test/integration/**/*_test.rb"]
2921
test.verbose = false
3022
test.warning = false
3123
end
3224

3325
Rake::TestTask.new(:all) do |test|
34-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
3526
test.libs << 'lib' << 'test'
3627
test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
3728
end

elasticsearch-rails/Rakefile

-9
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,21 @@ task :test => 'test:unit'
88

99
require 'rake/testtask'
1010
namespace :test do
11-
task :ci_reporter do
12-
ENV['CI_REPORTS'] ||= 'tmp/reports'
13-
require 'ci/reporter/rake/minitest'
14-
Rake::Task['ci:setup:minitest'].invoke
15-
end
16-
1711
Rake::TestTask.new(:unit) do |test|
18-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
1912
test.libs << 'lib' << 'test'
2013
test.test_files = FileList["test/unit/**/*_test.rb"]
2114
test.verbose = false
2215
test.warning = false
2316
end
2417

2518
Rake::TestTask.new(:integration) do |test|
26-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
2719
test.libs << 'lib' << 'test'
2820
test.test_files = FileList["test/integration/**/*_test.rb"]
2921
test.verbose = false
3022
test.warning = false
3123
end
3224

3325
Rake::TestTask.new(:all) do |test|
34-
Rake::Task['test:ci_reporter'].invoke if ENV['CI']
3526
test.libs << 'lib' << 'test'
3627
test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
3728
end

0 commit comments

Comments
 (0)