deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Lutterkort <lut...@redhat.com>
Subject Re: [PATCH core 1/6] Core: Make exception reporting silent on tests
Date Mon, 23 Jul 2012 21:50:14 GMT
On Mon, 2012-07-23 at 12:07 +0300, marios@redhat.com wrote:
> On 20/07/12 18:45, mfojtik@redhat.com wrote:
> > From: Michal Fojtik <mfojtik@redhat.com>
> > 
> > 
> > Signed-off-by: Michal fojtik <mfojtik@redhat.com>
> > ---
> >  server/lib/deltacloud/drivers/exceptions.rb |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/server/lib/deltacloud/drivers/exceptions.rb b/server/lib/deltacloud/drivers/exceptions.rb
> > index a89b05f..d5a8bc3 100644
> > --- a/server/lib/deltacloud/drivers/exceptions.rb
> > +++ b/server/lib/deltacloud/drivers/exceptions.rb
> > @@ -177,7 +177,9 @@ module Deltacloud
> >            if exdef.match?($!)
> >              new_exception = exdef.handler($!)
> >              m = new_exception.message.nil? ? $!.message : new_exception.message
> > -            $stderr.send(report_method, "#{[$!.class.to_s, m].join(':')}\n#{$!.backtrace[0..10].join("\n")}")
> > +            unless ENV['RACK_ENV'] == 'test'
> > +              $stderr.send(report_method, "#{[$!.class.to_s, m].join(':')}\n#{$!.backtrace[0..10].join("\n")}")
> > +            end
> >              raise exdef.handler($!) unless new_exception.nil?
> >            end
> >          end
> > 
> 
> ACK to series... nits:
> 
> "rake test" fails with: no such file to load -- minitest/autorun (LoadError)
> 
> "bundle exec rake test" runs fine, with test failures (I understand
> these are expected at this point). Full trace follows FYI:

I think it's time to apply the magic bundler patch below. Can anybody
think of the downside of doing this (besides requiring bundler) ? What
about checking in the Gemfile.lock ?

diff --git a/server/Rakefile b/server/Rakefile
index f232933..d4f4db5 100644
--- a/server/Rakefile
+++ b/server/Rakefile
@@ -20,6 +20,9 @@
 require 'rake'
 require 'rake/testtask'
 require 'rubygems/package_task'
+require "bundler/setup"
+
+Bundler.setup
 
 $top_srcdir = File.dirname(__FILE__)
 $:.unshift File.join($top_srcdir, 'lib')

David



Mime
View raw message