summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2010-12-06 13:28:28 -0800
committerPaul Berry <paul@puppetlabs.com>2010-12-06 13:28:28 -0800
commit4fb675d3e028c2429f4fa56bf172d60127c9e608 (patch)
tree72acd2d38fce6ac7237f53ee2923f6778fa0928e /spec
parentd4d51e3d7720108c063505884cca015aff77eff1 (diff)
parentc5a1ca0b34a57366415df60099ab0918a7579469 (diff)
downloadpuppet-4fb675d3e028c2429f4fa56bf172d60127c9e608.tar.gz
puppet-4fb675d3e028c2429f4fa56bf172d60127c9e608.tar.xz
puppet-4fb675d3e028c2429f4fa56bf172d60127c9e608.zip
Merge remote branch 'someword/feature/master/5391' into next
* someword/feature/master/5391: (#5391) Include additional zfs properties
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/provider/zfs/solaris_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/provider/zfs/solaris_spec.rb b/spec/unit/provider/zfs/solaris_spec.rb
index 75f1605cf..4998ba6fe 100755
--- a/spec/unit/provider/zfs/solaris_spec.rb
+++ b/spec/unit/provider/zfs/solaris_spec.rb
@@ -75,7 +75,7 @@ describe provider_class do
end
- [:mountpoint, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop|
+ [:mountpoint, :recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop|
describe "when getting the #{prop} value" do
it "should call zfs with :get, #{prop} and this zfs" do
@provider.expects(:zfs).with(:get, "-H", "-o", "value", prop, @resource[:name]).returns("value\n")