diff options
| -rwxr-xr-x | lib/puppet/type/mount.rb | 8 | ||||
| -rwxr-xr-x | test/types/mount.rb | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb index df0beca6f..1f8147b77 100755 --- a/lib/puppet/type/mount.rb +++ b/lib/puppet/type/mount.rb @@ -43,14 +43,6 @@ module Puppet provider.mount end - defaultto do - if @parent.managed? - :mounted - else - nil - end - end - def retrieve if provider.mounted? @is = :mounted diff --git a/test/types/mount.rb b/test/types/mount.rb index 9bdf599cd..d153d3482 100755 --- a/test/types/mount.rb +++ b/test/types/mount.rb @@ -108,6 +108,7 @@ class TestMounts < Test::Unit::TestCase def test_simplemount mount = mkmount + mount[:ensure] = :mounted assert_apply(mount) mount.send(:states).each do |state| @@ -118,8 +119,6 @@ class TestMounts < Test::Unit::TestCase assert_nothing_raised { mount.retrieve } - assert_equal(:mounted, mount.is(:ensure)) - # Now modify a field mount[:dump] = 2 mount[:options] = "defaults,ro" @@ -269,6 +268,7 @@ class TestMounts < Test::Unit::TestCase def test_refresh mount = mkmount + mount[:ensure] = :mounted remounted = false mount.provider.meta_def(:remount) do @@ -297,6 +297,13 @@ class TestMounts < Test::Unit::TestCase assert(! remounted, "remounted even though not supposed to be mounted") end + + def test_no_default_for_ensure + mount = mkmount + mount.finish + + assert_nil(mount.should(:ensure), "Found default for ensure") + end end # $Id$ |