diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-04-08 16:05:41 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-04-08 16:23:45 -0700 |
| commit | 64be97bdfe029e0fa5f33a06963f4c18ca3968d4 (patch) | |
| tree | c99a8a589c181bbc9c5a1afe6b1e230717c01915 | |
| parent | 270e179a183b4432dc82958bd002eecd605bc079 (diff) | |
| download | puppet-64be97bdfe029e0fa5f33a06963f4c18ca3968d4.tar.gz puppet-64be97bdfe029e0fa5f33a06963f4c18ca3968d4.tar.xz puppet-64be97bdfe029e0fa5f33a06963f4c18ca3968d4.zip | |
maint: Fix sqlite3 require to really be optional
You need to specifically rescue LoadError if you want requires to be
optional.
Paired-with: Nick Lewis
| -rwxr-xr-x | spec/unit/indirector/facts/inventory_active_record_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/unit/indirector/facts/inventory_active_record_spec.rb b/spec/unit/indirector/facts/inventory_active_record_spec.rb index 4e20532c4..02dd495da 100755 --- a/spec/unit/indirector/facts/inventory_active_record_spec.rb +++ b/spec/unit/indirector/facts/inventory_active_record_spec.rb @@ -1,7 +1,10 @@ #!/usr/bin/env ruby require 'spec_helper' -require 'sqlite3' rescue nil +begin + require 'sqlite3' +rescue LoadError +end require 'tempfile' require 'puppet/rails' |