-
Notifications
You must be signed in to change notification settings - Fork 21.4k
Commit
Partially reverts 14c89e7. Hat tip to @tenderlove for paring down the TestTask!
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,8 @@ | ||
module Rails | ||
# Don't abort when tests fail; move on the next test task. | ||
# Silence the default description to cut down on `rake -T` noise. | ||
class SubTestTask < Rake::TestTask | ||
# Create the tasks defined by this task lib. | ||
def define | ||
lib_path = @libs.join(File::PATH_SEPARATOR) | ||
task @name do | ||
run_code = '' | ||
RakeFileUtils.verbose(@verbose) do | ||
run_code = | ||
case @loader | ||
when :direct | ||
"-e 'ARGV.each{|f| load f}'" | ||
when :testrb | ||
"-S testrb #{fix}" | ||
when :rake | ||
rake_loader | ||
end | ||
@ruby_opts.unshift( "-I\"#{lib_path}\"" ) | ||
@ruby_opts.unshift( "-w" ) if @warning | ||
|
||
begin | ||
ruby @ruby_opts.join(" ") + | ||
" \"#{run_code}\" " + | ||
file_list.collect { |fn| "\"#{fn}\"" }.join(' ') + | ||
" #{option_list}" | ||
rescue => error | ||
warn "Error running #{name}: #{error.inspect}" | ||
end | ||
end | ||
end | ||
self | ||
def desc(string) | ||
# Ignore the description. | ||
end | ||
end | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,7 +55,21 @@ namespace :test do | |
# Placeholder task for other Railtie and plugins to enhance. See Active Record for an example. | ||
end | ||
|
||
task :run => %w(test:units test:functionals test:integration) | ||
task :run do | ||
errors = %w(test:units test:functionals test:integration).collect do |task| | ||
begin | ||
Rake::Task[task].invoke | ||
nil | ||
rescue => e | ||
{ :task => task, :exception => e } | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
jeremy
Author
Member
|
||
end | ||
end.compact | ||
|
||
if errors.any? | ||
puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n") | ||
abort | ||
end | ||
end | ||
|
||
Rake::TestTask.new(:recent => "test:prepare") do |t| | ||
since = TEST_CHANGES_SINCE | ||
|
4 comments
on commit abe4a8d
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the fix ! Our jenkins was not complaining about failing test..
When will you release that fix ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll backport this commit to 3-2-stable (if it hasn't been backported already). I'm not sure about a release date for 3.2.2 though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great, now my CruiseControl.rb installation is working! Looking forward to 3.2.2 stable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious if there are any unit tests around this?
The previous code had a warning emitted here. Do we want to keep that functionality?