Merge branch '2.6.x' into next

    * 2.6.x: (36 commits)
      Updated CHANGELOG for 2.6.7rc1
      (#5073) Download plugins even if you're filtering on tags
      Fix #5610: Prevent unnecessary RAL lookups
      Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
      (#6723) Fix withenv environment restoration bug
      (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
      Remove extra trailing whitespace from lib/puppet/resource.rb
      (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
      (#6707) Fix typo in rest_authconfig.rb
      (#6689) Make inventory_active_record terminus search quickly
      (#5392) Give a better error when realizing a non-existant resource
      (#2645) Adding a less-stubby test to verify the "system" attribute's behavior
      Update CHANGELOG for 2.6.6
      maint: Remove serialization of InventoryFact values
      maint: Rename InventoryHost to InventoryNode
      Fixed #2645 - Added support for creating system users
      maint: Remove spec run noise
      maint:Refactor of mount provider integration tests
      (#6338) Support searching on metadata in InventoryActiveRecord terminus
      (#6338) Implement search for InventoryActiveRecord facts terminus
      ...

    This merge includes essentially reverting #4904's change to the mount
    type since tests that came in from 2.6.x specified different
    behavior and what's correct is not clear to me.  I've reopened #4904 and
    added it to our backlog, and talked to Nigel about the RFC that's
    currently out on the puppet-users mailing list for a bigger refactor of
    how the mount provider works.

    Manually Resolved Conflicts:
        spec/spec_helper.rb
        spec/unit/indirector/queue_spec.rb

1 files changed, 151 insertions, 0 deletions

diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb
new file mode 100644
index 000000000..d6f25fe1d
--- /dev/null
+++ b/spec/integration/provider/mount_spec.rb
@@ -0,0 +1,151 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/file_bucket/dipper'
+
+describe "mount provider (integration)" do
+  include PuppetSpec::Files
+
+  def create_fake_fstab(initially_contains_entry)
+    File.open(@fake_fstab, 'w') do |f|
+      if initially_contains_entry
+        f.puts("/dev/disk1s1\t/Volumes/foo_disk\tmsdos\tlocal\t0\t0")
+      end
+    end
+  end
+
+  before :each do
+    @fake_fstab = tmpfile('fstab')
+    @current_options = "local"
+    @current_device = "/dev/disk1s1"
+    Puppet::Type.type(:mount).defaultprovider.stubs(:default_target).returns(@fake_fstab)
+    Facter.stubs(:value).with(:operatingsystem).returns('Darwin')
+    Puppet::Util::ExecutionStub.set do |command, options|
+      case command[0]
+      when %r{/s?bin/mount}
+        if command.length == 1
+          if @mounted
+            "#{@current_device} on /Volumes/foo_disk (msdos, #{@current_options})\n"
+          else
+            ''
+          end
+        else
+          command.length.should == 4
+          command[1].should == '-o'
+          command[3].should == '/Volumes/foo_disk'
+          @mounted.should == false # verify that we don't try to call "mount" redundantly
+          @current_options = command[2]
+          @current_device = check_fstab(true)
+          @mounted = true
+          ''
+        end
+      when %r{/s?bin/umount}
+        command.length.should == 2
+        command[1].should == '/Volumes/foo_disk'
+        @mounted.should == true # "umount" doesn't work when device not mounted (see #6632)
+        @mounted = false
+        ''
+      else
+        fail "Unexpected command #{command.inspect} executed"
+      end
+    end
+  end
+
+  after :each do
+    Puppet::Type::Mount::ProviderParsed.clear # Work around bug #6628
+  end
+
+  def check_fstab(expected_to_be_present)
+    # Verify that the fake fstab has the expected data in it
+    fstab_contents = File.read(@fake_fstab).lines.map(&:chomp).reject { |x| x =~ /^#|^$/ }
+    if expected_to_be_present
+      fstab_contents.length().should == 1
+      device, rest_of_line = fstab_contents[0].split(/\t/,2)
+      rest_of_line.should == "/Volumes/foo_disk\tmsdos\t#{@desired_options}\t0\t0"
+      device
+    else
+      fstab_contents.length().should == 0
+      nil
+    end
+  end
+
+  def run_in_catalog(settings)
+    resource = Puppet::Type.type(:mount).new(settings.merge(:name => "/Volumes/foo_disk",
+                                             :device => "/dev/disk1s1", :fstype => "msdos"))
+    Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to the filebucket
+    resource.expects(:err).never
+    catalog = Puppet::Resource::Catalog.new
+    catalog.host_config = false # Stop Puppet from doing a bunch of magic
+    catalog.add_resource resource
+    catalog.apply
+  end
+
+  [false, true].each do |initial_state|
+    describe "When initially #{initial_state ? 'mounted' : 'unmounted'}" do
+      before :each do
+        @mounted = initial_state
+      end
+
+      [false, true].each do |initial_fstab_entry|
+        describe "When there is #{initial_fstab_entry ? 'an' : 'no'} initial fstab entry" do
+          before :each do
+            create_fake_fstab(initial_fstab_entry)
+          end
+
+          [:defined, :present, :mounted, :unmounted, :absent].each do |ensure_setting|
+            expected_final_state = case ensure_setting
+              when :mounted
+                true
+              when :unmounted, :absent
+                false
+              when :defined, :present
+                initial_state
+              else
+                fail "Unknown ensure_setting #{ensure_setting}"
+            end
+            expected_fstab_data = (ensure_setting != :absent)
+            describe "When setting ensure => #{ensure_setting}" do
+              ["local", "journaled"].each do |options_setting|
+                describe "When setting options => #{options_setting}" do
+                  it "should leave the system in the #{expected_final_state ? 'mounted' : 'unmounted'} state, #{expected_fstab_data ? 'with' : 'without'} data in /etc/fstab" do
+                    @desired_options = options_setting
+                    run_in_catalog(:ensure=>ensure_setting, :options => options_setting)
+                    @mounted.should == expected_final_state
+                    if expected_fstab_data
+                      check_fstab(expected_fstab_data).should == "/dev/disk1s1"
+                    else
+                      check_fstab(expected_fstab_data).should == nil
+                    end
+                    if @mounted
+                      if ![:defined, :present].include?(ensure_setting)
+                        @current_options.should == @desired_options
+                      elsif initial_fstab_entry
+                        @current_options.should == @desired_options
+                      else
+                        @current_options.should == 'local' #Workaround for #6645
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  describe "When the wrong device is mounted" do
+    it "should remount the correct device" do
+      pending "Due to bug 6309"
+      @mounted = true
+      @current_device = "/dev/disk2s2"
+      create_fake_fstab(true)
+      @desired_options = "local"
+      run_in_catalog(:ensure=>:mounted, :options=>'local')
+      @current_device.should=="/dev/disk1s1"
+      @mounted.should==true
+      @current_options.should=='local'
+      check_fstab(true).should == "/dev/disk1s1"
+    end
+  end
+end