diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-06-28 17:08:02 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-28 17:23:45 -0700 |
| commit | b2bd05d8701e5e785cf5da4136bfd65a419e6b34 (patch) | |
| tree | b36c022ebca681dbde92d723c16c1d79f63036ab | |
| parent | fdc8c3509b5ac5bc170c54d72b2c2bafb58409f2 (diff) | |
| download | puppet-b2bd05d8701e5e785cf5da4136bfd65a419e6b34.tar.gz puppet-b2bd05d8701e5e785cf5da4136bfd65a419e6b34.tar.xz puppet-b2bd05d8701e5e785cf5da4136bfd65a419e6b34.zip | |
maint: Confine a test that depends on sqlite
I'm also going to update the wiki to mention sqlite is a test dependency
| -rw-r--r-- | lib/puppet/feature/base.rb | 3 | ||||
| -rwxr-xr-x | spec/unit/indirector/node/active_record_spec.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb index 2bdff3fcb..a72ebb0eb 100644 --- a/lib/puppet/feature/base.rb +++ b/lib/puppet/feature/base.rb @@ -48,3 +48,6 @@ raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.featur # We have CouchDB Puppet.features.add(:couchdb, :libs => ["couchrest"]) + +# We have sqlite +Puppet.features.add(:sqlite, :libs => ["sqlite3"]) diff --git a/spec/unit/indirector/node/active_record_spec.rb b/spec/unit/indirector/node/active_record_spec.rb index 1d90295cf..9143df60d 100755 --- a/spec/unit/indirector/node/active_record_spec.rb +++ b/spec/unit/indirector/node/active_record_spec.rb @@ -6,6 +6,7 @@ require 'puppet/node' describe "Puppet::Node::ActiveRecord" do confine "Missing Rails" => Puppet.features.rails? + confine "Missing sqlite" => Puppet.features.sqlite? before do require 'puppet/indirector/node/active_record' end |