puppet 2.6.6 → 2.6.7

data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb

@@ -104,6 +104,7 @@ describe provider_class do
   before :each do
     @resource = stub("resource", :name => "foo")
     @resource.stubs(:[]).returns "foo"
+    @resource.class.stubs(:key_attributes).returns( [:name] )
 
     @provider = provider_class.new(@resource)
     provider_class.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)

data/spec/unit/provider/user/user_role_add_spec.rb

@@ -115,6 +115,7 @@ describe provider_class do
   describe "when allow duplicate is enabled" do
     before do
       @resource.expects(:allowdupe?).returns true
+      @resource.stubs(:system?)
       @provider.stubs(:is_role?).returns(false)
       @provider.stubs(:execute)
       @provider.expects(:execute).with { |args| args.include?("-o") }

data/spec/unit/provider/user/useradd_spec.rb

@@ -15,6 +15,7 @@ describe provider_class do
   # #1360
   it "should add -o when allowdupe is enabled and the user is being created" do
     @resource.expects(:allowdupe?).returns true
+    @resource.expects(:system?).returns true
     @provider.stubs(:execute)
     @provider.expects(:execute).with { |args| args.include?("-o") }
     @provider.create
@@ -27,6 +28,14 @@ describe provider_class do
     @provider.uid = 150
   end
 
+  it "should add -r when system is enabled" do
+    @resource.expects(:allowdupe?).returns true
+    @resource.expects(:system?).returns true
+    @provider.stubs(:execute)
+    @provider.expects(:execute).with { |args| args.include?("-r") }
+    @provider.create
+  end
+
   it "should set password age rules" do
     provider_class.has_feature :manages_password_age
     @resource = Puppet::Type.type(:user).new :name => "myuser", :password_min_age => 5, :password_max_age => 10, :provider => :useradd
@@ -53,6 +62,23 @@ describe provider_class do
     end
   end
 
+  describe "when checking to add system users" do
+    it "should check system users" do
+      @resource.expects(:system?)
+      @provider.check_system_users
+    end
+
+    it "should return an array with a flag if it's a system user" do
+      @resource.stubs(:system?).returns true
+      @provider.check_system_users.must == ["-r"]
+    end
+
+    it "should return an empty array if it's not a system user" do
+      @resource.stubs(:system?).returns false
+      @provider.check_system_users.must == []
+    end
+  end
+
   describe "when checking manage home" do
     it "should check manage home" do
       @resource.expects(:managehome?)
@@ -88,6 +114,7 @@ describe provider_class do
     before do
       @resource.stubs(:allowdupe?).returns true
       @resource.stubs(:managehome?).returns true
+      @resource.stubs(:system?).returns true
     end
 
     it "should call command with :add" do
@@ -115,20 +142,32 @@ describe provider_class do
       @provider.addcmd
     end
 
+    it "should return an array with -r if system? is true" do
+      resource = Puppet::Type.type(:user).new( :name => "bob", :system => true)
+
+      provider_class.new( resource ).addcmd.should include("-r")
+    end
+
+    it "should return an array without -r if system? is false" do
+      resource = Puppet::Type.type(:user).new( :name => "bob", :system => false)
+
+      provider_class.new( resource ).addcmd.should_not include("-r")
+    end
+
     it "should return an array with full command" do
       @provider.stubs(:command).with(:add).returns("useradd")
       @provider.stubs(:add_properties).returns(["-G", "somegroup"])
       @resource.stubs(:[]).with(:name).returns("someuser")
       @resource.stubs(:[]).with(:expiry).returns("somedate")
-      @provider.addcmd.must == ["useradd", "-G", "somegroup", "-o", "-m", '-e somedate', "someuser"]
+      @provider.addcmd.must == ["useradd", "-G", "somegroup", "-o", "-m", '-e somedate', "-r", "someuser"]
     end
 
-    it "should return an array without -e if expery is undefined full command" do
+    it "should return an array without -e if expiry is undefined full command" do
       @provider.stubs(:command).with(:add).returns("useradd")
       @provider.stubs(:add_properties).returns(["-G", "somegroup"])
       @resource.stubs(:[]).with(:name).returns("someuser")
       @resource.stubs(:[]).with(:expiry).returns nil
-      @provider.addcmd.must == ["useradd", "-G", "somegroup", "-o", "-m", "someuser"]
+      @provider.addcmd.must == ["useradd", "-G", "somegroup", "-o", "-m", "-r", "someuser"]
     end
   end
 
@@ -136,6 +175,7 @@ describe provider_class do
     before do
       @resource.stubs(:allowdupe?).returns true
       @resource.stubs(:managehome?).returns true
+      @resource.stubs(:system?).returns true
     end
 
     it "should call command with :pass" do

data/spec/unit/reports/store_spec.rb

@@ -11,7 +11,7 @@ describe processor do
   describe "#process" do
     include PuppetSpec::Files
     before :each do
-      Puppet[:reportdir] = tmpdir('reports')
+      Puppet[:reportdir] = tmpdir('reports') << '/reports' 
       @report = YAML.load_file(File.join(PuppetSpec::FIXTURE_DIR, 'yaml/report2.6.x.yaml')).extend processor
     end
 

data/spec/unit/resource_spec.rb

@@ -99,11 +99,11 @@ describe Puppet::Resource do
   end
 
   it 'should fail if strict is set and type does not exist' do
-    lambda { Puppet::Resource.new('foo', 'title', {:strict=>true}) }.should raise_error(ArgumentError, 'Invalid resource type foo') 
+    lambda { Puppet::Resource.new('foo', 'title', {:strict=>true}) }.should raise_error(ArgumentError, 'Invalid resource type foo')
   end
 
   it 'should fail if strict is set and class does not exist' do
-    lambda { Puppet::Resource.new('Class', 'foo', {:strict=>true}) }.should raise_error(ArgumentError, 'Could not find declared class foo') 
+    lambda { Puppet::Resource.new('Class', 'foo', {:strict=>true}) }.should raise_error(ArgumentError, 'Could not find declared class foo')
   end
 
   it "should fail if the title is a hash and the type is not a valid resource reference string" do
@@ -463,6 +463,28 @@ describe Puppet::Resource do
     end
   end
 
+  describe "when loading 0.25.x storedconfigs YAML" do
+    before :each do
+      @old_storedconfig_yaml = %q{--- !ruby/object:Puppet::Resource::Reference
+builtin_type:
+title: /tmp/bar
+type: File
+}
+    end
+
+    it "should deserialize a Puppet::Resource::Reference without exceptions" do
+      lambda { YAML.load(@old_storedconfig_yaml) }.should_not raise_error
+    end
+
+    it "should deserialize as a Puppet::Resource::Reference as a Puppet::Resource" do
+      YAML.load(@old_storedconfig_yaml).class.should == Puppet::Resource
+    end
+
+    it "should to_hash properly" do
+      YAML.load(@old_storedconfig_yaml).to_hash.should == { :path => "/tmp/bar" }
+    end
+  end
+
   describe "when converting to a RAL resource" do
     it "should use the resource type's :new method to create the resource if the resource is of a builtin type" do
       resource = Puppet::Resource.new("file", @basepath+"/my/file")
@@ -486,19 +508,23 @@ describe Puppet::Resource do
 
   describe "when converting to puppet code" do
     before do
-      @resource = Puppet::Resource.new("one::two", "/my/file", :parameters => {:noop => true, :foo => %w{one two}})
-    end
-
-    it "should print the type and title" do
-      @resource.to_manifest.should be_include("one::two { '/my/file':\n")
-    end
-
-    it "should print each parameter, with the value single-quoted" do
-      @resource.to_manifest.should be_include("    noop => 'true'")
+      @resource = Puppet::Resource.new("one::two", "/my/file",
+        :parameters => {
+          :noop => true,
+          :foo => %w{one two},
+          :ensure => 'present',
+        }
+      )
     end
 
-    it "should print array values appropriately" do
-      @resource.to_manifest.should be_include("    foo => ['one','two']")
+    it "should align, sort and add trailing commas to attributes with ensure first" do
+      @resource.to_manifest.should == <<-HEREDOC.gsub(/^\s{8}/, '').gsub(/\n$/, '')
+        one::two { '/my/file':
+          ensure => 'present',
+          foo    => ['one', 'two'],
+          noop   => 'true',
+        }
+      HEREDOC
     end
   end
 

data/spec/unit/type/file/content_spec.rb

@@ -4,15 +4,14 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f
 
 content = Puppet::Type.type(:file).attrclass(:content)
 describe content do
+  include PuppetSpec::Files
   before do
-    @resource = Puppet::Type.type(:file).new :path => "/foo/bar"
+    @filename = tmpfile('testfile')
+    @resource = Puppet::Type.type(:file).new :path => @filename
+    File.open(@filename, 'w') {|f| f.write "initial file content"}
     content.stubs(:standalone?).returns(false)
   end
 
-  it "should be a subclass of Property" do
-    content.superclass.must == Puppet::Property
-  end
-
   describe "when determining the checksum type" do
     it "should use the type specified in the source checksum if a source is set" do
       @resource[:source] = "/foo"
@@ -249,10 +248,10 @@ describe content do
   describe "when writing" do
     before do
       @content = content.new(:resource => @resource)
-      @fh = stub_everything
     end
 
     it "should attempt to read from the filebucket if no actual content nor source exists" do
+      @fh = File.open(@filename, 'w')
       @content.should = "{md5}foo"
       @content.resource.bucket.class.any_instance.stubs(:getfile).returns "foo"
       @content.write(@fh)
@@ -302,166 +301,68 @@ describe content do
 
     describe "from local source" do
       before(:each) do
-        @content.stubs(:actual_content).returns(nil)
-        @source = stub_everything 'source', :local? => true, :full_path => "/path/to/source"
-        @resource.stubs(:parameter).with(:source).returns @source
-
-        @sum = stub_everything 'sum'
-        @resource.stubs(:parameter).with(:checksum).returns(@sum)
-
-        @digest = stub_everything 'digest'
-        @sum.stubs(:sum_stream).yields(@digest)
-
-        @file = stub_everything 'file'
-        File.stubs(:open).yields(@file)
-        @file.stubs(:read).with(8192).returns("chunk1").then.returns("chunk2").then.returns(nil)
-      end
-
-      it "should open the local file" do
-        File.expects(:open).with("/path/to/source", "r")
-        @content.write(@fh)
-      end
+        @resource = Puppet::Type.type(:file).new :path => @filename, :backup => false
+        @sourcename = tmpfile('source')
+        @source_content = "source file content"*10000
+        @sourcefile = File.open(@sourcename, 'w') {|f| f.write @source_content}
 
-      it "should read the local file by chunks" do
-        @file.expects(:read).with(8192).returns("chunk1").then.returns(nil)
-        @content.write(@fh)
+        @content = @resource.newattr(:content)
+        @source = @resource.newattr(:source)
+        @source.stubs(:metadata).returns stub_everything('metadata', :source => @sourcename, :ftype => 'file')
       end
 
-      it "should write each chunk to the file" do
-        @fh.expects(:print).with("chunk1").then.with("chunk2")
-        @content.write(@fh)
-      end
-
-      it "should pass each chunk to the current sum stream" do
-        @digest.expects(:<<).with("chunk1").then.with("chunk2")
-        @content.write(@fh)
+      it "should copy content from the source to the file" do
+        @resource.write(@source)
+        File.read(@filename).should == @source_content
       end
 
       it "should return the checksum computed" do
-        @sum.stubs(:sum_stream).yields(@digest).returns("checksum")
-        @content.write(@fh).should == "checksum"
+        File.open(@filename, 'w') do |file|
+          @content.write(file).should == "{md5}#{Digest::MD5.hexdigest(@source_content)}"
+        end
       end
     end
 
     describe "from remote source" do
       before(:each) do
-        @response = stub_everything 'mock response', :code => "404"
+        @resource = Puppet::Type.type(:file).new :path => @filename, :backup => false
+        @response = stub_everything 'response', :code => "200"
+        @source_content = "source file content"*10000
+        @response.stubs(:read_body).multiple_yields(*(["source file content"]*10000))
+
         @conn = stub_everything 'connection'
         @conn.stubs(:request_get).yields(@response)
         Puppet::Network::HttpPool.stubs(:http_instance).returns @conn
 
-        @content.stubs(:actual_content).returns(nil)
-        @source = stub_everything 'source', :local? => false, :full_path => "/path/to/source", :server => "server", :port => 1234
-        @resource.stubs(:parameter).with(:source).returns @source
-
-        @sum = stub_everything 'sum'
-        @resource.stubs(:parameter).with(:checksum).returns(@sum)
-
-        @digest = stub_everything 'digest'
-        @sum.stubs(:sum_stream).yields(@digest)
-      end
-
-      it "should open a network connection to source server and port" do
-        Puppet::Network::HttpPool.expects(:http_instance).with("server", 1234).returns @conn
-        @content.write(@fh)
-      end
-
-      it "should send the correct indirection uri" do
-        @conn.expects(:request_get).with { |uri,headers| uri == "/production/file_content/path/to/source" }.yields(@response)
-        @content.write(@fh)
+        @content = @resource.newattr(:content)
+        @sourcename = "puppet:///test/foo"
+        @source = @resource.newattr(:source)
+        @source.stubs(:metadata).returns stub_everything('metadata', :source => @sourcename, :ftype => 'file')
       end
 
-      it "should return nil if source is not found" do
-        @response.expects(:code).returns("404")
-        @content.write(@fh).should == nil
+      it "should write the contents to the file" do
+        @resource.write(@source)
+        File.read(@filename).should == @source_content
       end
 
       it "should not write anything if source is not found" do
-        @response.expects(:code).returns("404")
-        @fh.expects(:print).never
-        @content.write(@fh).should == nil
+        @response.stubs(:code).returns("404")
+        lambda {@resource.write(@source)}.should raise_error(Net::HTTPError) { |e| e.message =~ /404/ }
+        File.read(@filename).should == "initial file content"
       end
 
       it "should raise an HTTP error in case of server error" do
-        @response.expects(:code).returns("500")
-        lambda { @content.write(@fh) }.should raise_error
-      end
-
-      it "should write content by chunks" do
-        @response.expects(:code).returns("200")
-        @response.expects(:read_body).multiple_yields("chunk1","chunk2")
-        @fh.expects(:print).with("chunk1").then.with("chunk2")
-        @content.write(@fh)
-      end
-
-      it "should pass each chunk to the current sum stream" do
-        @response.expects(:code).returns("200")
-        @response.expects(:read_body).multiple_yields("chunk1","chunk2")
-        @digest.expects(:<<).with("chunk1").then.with("chunk2")
-        @content.write(@fh)
+        @response.stubs(:code).returns("500")
+        lambda { @content.write(@fh) }.should raise_error { |e| e.message.include? @source_content }
       end
 
       it "should return the checksum computed" do
-        @response.expects(:code).returns("200")
-        @response.expects(:read_body).multiple_yields("chunk1","chunk2")
-        @sum.expects(:sum_stream).yields(@digest).returns("checksum")
-        @content.write(@fh).should == "checksum"
-      end
-
-      it "should get the current accept encoding header value" do
-        @content.expects(:add_accept_encoding)
-        @content.write(@fh)
-      end
-
-      it "should uncompress body on error" do
-        @response.expects(:code).returns("500")
-        @response.expects(:body).returns("compressed body")
-        @content.expects(:uncompress_body).with(@response).returns("uncompressed")
-        lambda { @content.write(@fh) }.should raise_error { |e| e.message =~ /uncompressed/ }
-      end
-
-      it "should uncompress chunk by chunk" do
-        uncompressor = stub_everything 'uncompressor'
-        @content.expects(:uncompress).with(@response).yields(uncompressor)
-        @response.expects(:code).returns("200")
-        @response.expects(:read_body).multiple_yields("chunk1","chunk2")
-
-        uncompressor.expects(:uncompress).with("chunk1").then.with("chunk2")
-        @content.write(@fh)
-      end
-
-      it "should write uncompressed chunks to the file" do
-        uncompressor = stub_everything 'uncompressor'
-        @content.expects(:uncompress).with(@response).yields(uncompressor)
-        @response.expects(:code).returns("200")
-        @response.expects(:read_body).multiple_yields("chunk1","chunk2")
-
-        uncompressor.expects(:uncompress).with("chunk1").returns("uncompressed1")
-        uncompressor.expects(:uncompress).with("chunk2").returns("uncompressed2")
-
-        @fh.expects(:print).with("uncompressed1")
-        @fh.expects(:print).with("uncompressed2")
-
-        @content.write(@fh)
-      end
-
-      it "should pass each uncompressed chunk to the current sum stream" do
-        uncompressor = stub_everything 'uncompressor'
-        @content.expects(:uncompress).with(@response).yields(uncompressor)
-        @response.expects(:code).returns("200")
-        @response.expects(:read_body).multiple_yields("chunk1","chunk2")
-
-        uncompressor.expects(:uncompress).with("chunk1").returns("uncompressed1")
-        uncompressor.expects(:uncompress).with("chunk2").returns("uncompressed2")
-
-        @digest.expects(:<<).with("uncompressed1").then.with("uncompressed2")
-        @content.write(@fh)
+        File.open(@filename, 'w') do |file|
+          @content.write(file).should == "{md5}#{Digest::MD5.hexdigest(@source_content)}"
+        end
       end
     end
 
-    describe "from a filebucket" do
-    end
-
     # These are testing the implementation rather than the desired behaviour; while that bites, there are a whole
     # pile of other methods in the File type that depend on intimate details of this implementation and vice-versa.
     # If these blow up, you are gonna have to review the callers to make sure they don't explode! --daniel 2011-02-01

data/spec/unit/type/file/selinux_spec.rb

@@ -66,6 +66,11 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f
       @sel.default.must == expectedresult
     end
 
+    it "should return nil for defaults if selinux_ignore_defaults is true" do
+      @resource[:selinux_ignore_defaults] = :true
+      @sel.default.must be_nil
+    end
+
     it "should be able to set a new context" do
       stat = stub 'stat', :ftype => "foo"
       @sel.should = %w{newone}

data/spec/unit/type/mount_spec.rb

@@ -11,10 +11,14 @@ describe Puppet::Type.type(:mount) do
     mount = Puppet::Type.type(:mount).new(:name => "yay")
     mount.should(:ensure).should be_nil
   end
+
+  it "should have :name as the only keyattribut" do
+    Puppet::Type.type(:mount).key_attributes.should == [:name]
+  end
 end
 
 describe Puppet::Type.type(:mount), "when validating attributes" do
-  [:name, :remounts].each do |param|
+  [:name, :remounts, :provider].each do |param|
     it "should have a #{param} parameter" do
       Puppet::Type.type(:mount).attrtype(param).should == :param
     end
@@ -38,9 +42,16 @@ describe Puppet::Type.type(:mount)::Ensure, "when validating values" do
     mount.should(:ensure).should == :defined
   end
 
+  it "should support :present as a value to :ensure" do
+    Puppet::Type.type(:mount).new(:name => "yay", :ensure => :present)
+  end
+
+  it "should support :defined as a value to :ensure" do
+    Puppet::Type.type(:mount).new(:name => "yay", :ensure => :defined)
+  end
+
   it "should support :unmounted as a value to :ensure" do
-    mount = Puppet::Type.type(:mount).new(:name => "yay", :ensure => :unmounted)
-    mount.should(:ensure).should == :unmounted
+    Puppet::Type.type(:mount).new(:name => "yay", :ensure => :unmounted)
   end
 
   it "should support :absent as a value to :ensure" do
@@ -54,7 +65,8 @@ end
 
 describe Puppet::Type.type(:mount)::Ensure do
   before :each do
-    @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock
+    provider_properties = {}
+    @provider = stub 'provider', :class => Puppet::Type.type(:mount).defaultprovider, :clear => nil, :satisfies? => true, :name => :mock, :property_hash => provider_properties
     Puppet::Type.type(:mount).defaultprovider.stubs(:new).returns(@provider)
     @mount = Puppet::Type.type(:mount).new(:name => "yay", :check => :ensure)
 
@@ -74,134 +86,150 @@ describe Puppet::Type.type(:mount)::Ensure do
     end
   end
 
-  describe Puppet::Type.type(:mount)::Ensure, "when retrieving its current state" do
-
-    it "should return the provider's value if it is :absent" do
-      @provider.expects(:ensure).returns(:absent)
-      @ensure.retrieve.should == :absent
-    end
-
-    it "should return :mounted if the provider indicates it is mounted and the value is not :absent" do
-      @provider.expects(:ensure).returns(:present)
-      @provider.expects(:mounted?).returns(true)
-      @ensure.retrieve.should == :mounted
-    end
-
-    it "should return :unmounted if the provider indicates it is not mounted and the value is not :absent" do
-      @provider.expects(:ensure).returns(:present)
-      @provider.expects(:mounted?).returns(false)
-      @ensure.retrieve.should == :unmounted
-    end
-  end
-
   describe Puppet::Type.type(:mount)::Ensure, "when changing the host" do
 
-    it "should destroy itself if it should be absent" do
-      @provider.stubs(:mounted?).returns(false)
-      @provider.expects(:destroy)
-      @ensure.should = :absent
-      @ensure.sync
-    end
-
-    it "should unmount itself before destroying if it is mounted and should be absent" do
-      @provider.expects(:mounted?).returns(true)
-      @provider.expects(:unmount)
-      @provider.expects(:destroy)
-      @ensure.should = :absent
-      @ensure.sync
-    end
-
-    it "should create itself if it is absent and should be defined" do
-      @provider.stubs(:ensure).returns(:absent)
-      @provider.stubs(:mounted?).returns(true)
-
-      @provider.stubs(:mounted?).returns(false)
-      @provider.expects(:create)
-      @ensure.should = :defined
-      @ensure.sync
-    end
-
-    it "should not unmount itself if it is mounted and should be defined" do
-      @provider.stubs(:ensure).returns(:mounted)
-      @provider.stubs(:mounted?).returns(true)
-
-      @provider.stubs(:create)
-      @provider.expects(:mount).never
-      @provider.expects(:unmount).never
-      @ensure.should = :defined
-      @ensure.sync
-    end
-
-    it "should not mount itself if it is unmounted and should be defined" do
-      @provider.stubs(:ensure).returns(:unmounted)
-      @provider.stubs(:mounted?).returns(false)
-
-      @ensure.stubs(:syncothers)
-      @provider.stubs(:create)
+    def test_ensure_change(options)
+      @provider.stubs(:get).with(:ensure).returns options[:from]
+      @provider.stubs(:ensure).returns options[:from]
+      @provider.stubs(:mounted?).returns([:mounted,:ghost].include? options[:from])
+      @provider.expects(:create).times(options[:create] || 0)
+      @provider.expects(:destroy).times(options[:destroy] || 0)
       @provider.expects(:mount).never
-      @provider.expects(:unmount).never
-      @ensure.should = :present
-      @ensure.sync
-    end
-
-    it "should unmount itself if it is mounted and should be unmounted" do
-      @provider.stubs(:ensure).returns(:present)
-      @provider.stubs(:mounted?).returns(true)
-
+      @provider.expects(:unmount).times(options[:unmount] || 0)
       @ensure.stubs(:syncothers)
-      @provider.expects(:unmount)
-      @ensure.should = :unmounted
+      @ensure.should = options[:to]
       @ensure.sync
-    end
+      (!!@provider.property_hash[:needs_mount]).should == (!!options[:mount])
+   end
+
+   it "should create itself when changing from :ghost to :present" do
+     test_ensure_change(:from => :ghost, :to => :present, :create => 1)
+   end
+
+   it "should create itself when changing from :absent to :present" do
+     test_ensure_change(:from => :absent, :to => :present, :create => 1)
+   end
 
-    it "should create and mount itself if it does not exist and should be mounted" do
-      @provider.stubs(:ensure).returns(:absent)
-      @provider.stubs(:mounted?).returns(false)
-      @provider.expects(:create)
-      @ensure.stubs(:syncothers)
-      @provider.expects(:mount)
-      @ensure.should = :mounted
-      @ensure.sync
-    end
+   it "should create itself and unmount when changing from :ghost to :unmounted" do
+     test_ensure_change(:from => :ghost, :to => :unmounted, :create => 1, :unmount => 1)
+   end
+
+   it "should unmount resource when changing from :mounted to :unmounted" do
+     test_ensure_change(:from => :mounted, :to => :unmounted, :unmount => 1)
+   end
+
+   it "should create itself when changing from :absent to :unmounted" do
+     test_ensure_change(:from => :absent, :to => :unmounted, :create => 1)
+   end
+
+   it "should unmount resource when changing from :ghost to :absent" do
+     test_ensure_change(:from => :ghost, :to => :absent, :unmount => 1)
+   end
+
+   it "should unmount and destroy itself when changing from :mounted to :absent" do
+     test_ensure_change(:from => :mounted, :to => :absent, :destroy => 1, :unmount => 1)
+   end
+
+   it "should destroy itself when changing from :unmounted to :absent" do
+     test_ensure_change(:from => :unmounted, :to => :absent, :destroy => 1)
+   end
+
+   it "should create itself when changing from :ghost to :mounted" do
+     test_ensure_change(:from => :ghost, :to => :mounted, :create => 1)
+   end
+
+   it "should create itself and mount when changing from :absent to :mounted" do
+     test_ensure_change(:from => :absent, :to => :mounted, :create => 1, :mount => 1)
+   end
+
+   it "should mount resource when changing from :unmounted to :mounted" do
+     test_ensure_change(:from => :unmounted, :to => :mounted, :mount => 1)
+   end
+
+
+   it "should be in sync if it is :absent and should be :absent" do
+     @ensure.should = :absent
+     @ensure.safe_insync?(:absent).should == true
+   end
+
+   it "should be out of sync if it is :absent and should be :defined" do
+     @ensure.should = :defined
+     @ensure.safe_insync?(:absent).should == false
+   end
+
+   it "should be out of sync if it is :absent and should be :mounted" do
+     @ensure.should = :mounted
+     @ensure.safe_insync?(:absent).should == false
+   end
+
+   it "should be out of sync if it is :absent and should be :unmounted" do
+     @ensure.should = :unmounted
+     @ensure.safe_insync?(:absent).should == false
+   end
+
+   it "should be out of sync if it is :mounted and should be :absent" do
+     @ensure.should = :absent
+     @ensure.safe_insync?(:mounted).should == false
+   end
+
+   it "should be in sync if it is :mounted and should be :defined" do
+     @ensure.should = :defined
+     @ensure.safe_insync?(:mounted).should == true
+   end
+
+   it "should be in sync if it is :mounted and should be :mounted" do
+     @ensure.should = :mounted
+     @ensure.safe_insync?(:mounted).should == true
+   end
+
+   it "should be out in sync if it is :mounted and should be :unmounted" do
+     @ensure.should = :unmounted
+     @ensure.safe_insync?(:mounted).should == false
+   end
+
+
+   it "should be out of sync if it is :unmounted and should be :absent" do
+     @ensure.should = :absent
+     @ensure.safe_insync?(:unmounted).should == false
+   end
+
+   it "should be in sync if it is :unmounted and should be :defined" do
+     @ensure.should = :defined
+     @ensure.safe_insync?(:unmounted).should == true
+   end
+
+   it "should be out of sync if it is :unmounted and should be :mounted" do
+     @ensure.should = :mounted
+     @ensure.safe_insync?(:unmounted).should == false
+   end
+
+   it "should be in sync if it is :unmounted and should be :unmounted" do
+     @ensure.should = :unmounted
+     @ensure.safe_insync?(:unmounted).should == true
+   end
 
-    it "should mount itself if it is present and should be mounted" do
-      @provider.stubs(:ensure).returns(:present)
-      @provider.stubs(:mounted?).returns(false)
-      @ensure.stubs(:syncothers)
-      @provider.expects(:mount)
-      @ensure.should = :mounted
-      @ensure.sync
-    end
 
-    it "should create but not mount itself if it is absent and mounted and should be mounted" do
-      @provider.stubs(:ensure).returns(:absent)
-      @provider.stubs(:mounted?).returns(true)
-      @ensure.stubs(:syncothers)
-      @provider.expects(:create)
-      @ensure.should = :mounted
-      @ensure.sync
-    end
-
-    it "should be insync if it is mounted and should be defined" do
-      @ensure.should = :defined
-      @ensure.safe_insync?(:mounted).should == true
-    end
-
-    it "should be insync if it is unmounted and should be defined" do
-      @ensure.should = :defined
-      @ensure.safe_insync?(:unmounted).should == true
-    end
+   it "should be out of sync if it is :ghost and should be :absent" do
+     @ensure.should = :absent
+     @ensure.safe_insync?(:ghost).should == false
+   end
 
-    it "should be insync if it is mounted and should be present" do
-      @ensure.should = :present
-      @ensure.safe_insync?(:mounted).should == true
-    end
+   it "should be out of sync if it is :ghost and should be :defined" do
+     @ensure.should = :defined
+     @ensure.safe_insync?(:ghost).should == false
+   end
+
+   it "should be out of sync if it is :ghost and should be :mounted" do
+     @ensure.should = :mounted
+     @ensure.safe_insync?(:ghost).should == false
+   end
+
+   it "should be out of sync if it is :ghost and should be :unmounted" do
+     @ensure.should = :unmounted
+     @ensure.safe_insync?(:ghost).should == false
+   end
 
-    it "should be insync if it is unmounted and should be present" do
-      @ensure.should = :present
-      @ensure.safe_insync?(:unmounted).should == true
-    end
-  end
+ end
 
   describe Puppet::Type.type(:mount), "when responding to events" do
 
@@ -258,4 +286,21 @@ describe Puppet::Type.type(:mount), "when modifying an existing mount entry" do
 
     @catalog.apply
   end
+
+  it "should umount before flushing changes to disk" do
+    syncorder = sequence('syncorder')
+    @mount.provider.expects(:options).returns 'soft'
+    @mount.provider.expects(:ensure).returns :mounted
+
+    @mount.provider.expects(:unmount).in_sequence(syncorder)
+    @mount.provider.expects(:options=).in_sequence(syncorder).with 'hard'
+    @mount.expects(:flush).in_sequence(syncorder) # Call inside syncothers
+    @mount.expects(:flush).in_sequence(syncorder) # I guess transaction or anything calls flush again
+
+    @mount[:ensure] = :unmounted
+    @mount[:options] = 'hard'
+
+    @catalog.apply
+  end
+
 end