chef 12.0.0.alpha.1 → 12.0.0.alpha.2

data/spec/unit/provider/ifconfig/redhat_spec.rb

@@ -37,22 +37,26 @@ describe Chef::Provider::Ifconfig::Redhat do
     status = double("Status", :exitstatus => 0)
     @provider.instance_variable_set("@status", status)
     @provider.current_resource = @current_resource
- end
+
+    config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
+    @config = double("chef-resource-file")
+    @provider.should_receive(:resource_for_config).with(config_filename).and_return(@config)
+  end
 
   describe "generate_config for action_add" do
 
-     it "should write network-script for centos" do
+    it "should write network-script for centos" do
       @provider.stub(:load_current_resource)
       @provider.stub(:run_command)
-      config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-      config_file = StringIO.new
-      File.should_receive(:new).with(config_filename, "w").and_return(config_file)
-
+      @config.should_receive(:content) do |arg|
+        arg.should match(/^\s*DEVICE=eth0\s*$/)
+        arg.should match(/^\s*IPADDR=10\.0\.0\.1\s*$/)
+        arg.should match(/^\s*NETMASK=255\.255\.254\.0\s*$/)
+      end
+      @config.should_receive(:run_action).with(:create)
+      @config.should_receive(:updated?).and_return(true)
       @provider.run_action(:add)
-      config_file.string.should match(/^\s*DEVICE=eth0\s*$/)
-      config_file.string.should match(/^\s*IPADDR=10\.0\.0\.1\s*$/)
-      config_file.string.should match(/^\s*NETMASK=255\.255\.254\.0\s*$/)
-     end
+    end
   end
 
   describe "delete_config for action_delete" do
@@ -61,10 +65,8 @@ describe Chef::Provider::Ifconfig::Redhat do
       @current_resource.device @new_resource.device
       @provider.stub(:load_current_resource)
       @provider.stub(:run_command)
-      config_filename =  "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-      File.should_receive(:exist?).with(config_filename).and_return(true)
-      FileUtils.should_receive(:rm_f).with(config_filename, :verbose => false)
-
+      @config.should_receive(:run_action).with(:delete)
+      @config.should_receive(:updated?).and_return(true)
       @provider.run_action(:delete)
     end
   end

data/spec/unit/provider/ifconfig_spec.rb

@@ -72,7 +72,7 @@ describe Chef::Provider::Ifconfig do
       @provider.stub(:load_current_resource)
       @provider.should_not_receive(:run_command)
       @current_resource.inet_addr "10.0.0.1"
-      @provider.should_not_receive(:generate_config)
+      @provider.should_receive(:generate_config)
 
       @provider.run_action(:add)
       @new_resource.should_not be_updated
@@ -123,7 +123,7 @@ describe Chef::Provider::Ifconfig do
     it "should not delete interface if it does not exist" do
       @provider.stub(:load_current_resource)
       @provider.should_not_receive(:run_command)
-      @provider.should_not_receive(:delete_config)
+      @provider.should_receive(:delete_config)
 
       @provider.run_action(:delete)
       @new_resource.should_not be_updated
@@ -171,7 +171,7 @@ describe Chef::Provider::Ifconfig do
       @provider.stub(:load_current_resource)
       # This is so that nothing actually runs
       @provider.should_not_receive(:run_command)
-      @provider.should_not_receive(:delete_config)
+      @provider.should_receive(:delete_config)
 
       @provider.run_action(:delete)
       @new_resource.should_not be_updated

data/spec/unit/provider/link_spec.rb

@@ -38,8 +38,8 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
     result
   end
 
-  def canonicalize(path)
-    Chef::Platform.windows? ? path.gsub('/', '\\') : path
+  def paths_eql?(path1, path2)
+    Chef::Util::PathHelper.paths_eql?(path1, path2)
   end
 
   describe "when the target is a symlink" do
@@ -68,7 +68,7 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
         provider.current_resource.link_type.should == :symbolic
       end
       it "should update the source of the existing link with the links target" do
-        provider.current_resource.to.should == canonicalize("#{CHEF_SPEC_DATA}/fofile")
+        paths_eql?(provider.current_resource.to, "#{CHEF_SPEC_DATA}/fofile").should be_true
       end
       it "should set the owner" do
         provider.current_resource.owner.should == 501
@@ -110,7 +110,7 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
         provider.current_resource.link_type.should == :symbolic
       end
       it "should update the source of the existing link to the link's target" do
-        provider.current_resource.to.should == canonicalize("#{CHEF_SPEC_DATA}/fofile")
+        paths_eql?(provider.current_resource.to, "#{CHEF_SPEC_DATA}/fofile").should be_true
       end
       it "should not set the owner" do
         provider.current_resource.owner.should be_nil
@@ -221,7 +221,7 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
         provider.current_resource.link_type.should == :hard
       end
       it "should update the source of the existing link to the link's target" do
-        provider.current_resource.to.should == canonicalize("#{CHEF_SPEC_DATA}/fofile")
+        paths_eql?(provider.current_resource.to, "#{CHEF_SPEC_DATA}/fofile").should be_true
       end
       it "should not set the owner" do
         provider.current_resource.owner.should == nil

data/spec/unit/provider/mount/mount_spec.rb

@@ -347,7 +347,16 @@ describe Chef::Provider::Mount::Mount do
       it "should use mount -o remount if remount is supported" do
         @new_resource.supports({:remount => true})
         @current_resource.mounted(true)
-        @provider.should_receive(:shell_out!).with("mount -o remount #{@new_resource.mount_point}")
+        @provider.should_receive(:shell_out!).with("mount -o remount,defaults #{@new_resource.mount_point}")
+        @provider.remount_fs
+      end
+
+      it "should use mount -o remount with new mount options if remount is supported" do
+        @new_resource.supports({:remount => true})
+        options = "rw,noexec,noauto"
+        @new_resource.options(%w{rw noexec noauto})
+        @current_resource.mounted(true)
+        @provider.should_receive(:shell_out!).with("mount -o remount,rw,noexec,noauto #{@new_resource.mount_point}")
         @provider.remount_fs
       end
 

data/spec/unit/provider/mount/solaris_spec.rb

@@ -21,6 +21,7 @@ require 'ostruct'
 
 # Do not run these tests on windows because some path handling
 # code is not implemented to handle windows paths.
+
 describe Chef::Provider::Mount::Solaris, :unix_only do
   let(:node) { Chef::Node.new }
 
@@ -34,6 +35,8 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
 
   let(:device) { "/dev/dsk/c0t2d0s7" }
 
+  let(:fsck_device) { "/dev/rdsk/c0t2d0s7" }
+
   let(:mountpoint) { "/mnt/foo" }
 
   let(:options) { nil }
@@ -42,9 +45,9 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
     new_resource = Chef::Resource::Mount.new(mountpoint)
     new_resource.device      device
     new_resource.device_type device_type
+    new_resource.fsck_device fsck_device
     new_resource.fstype      fstype
     new_resource.options     options
-
     new_resource.supports :remount => false
     new_resource
   }
@@ -123,9 +126,10 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       expect { provider.run_action(:remount) }.to raise_error(Chef::Exceptions::Mount)
     end
 
-    %w{tmpfs nfs ctfs proc mntfs objfs sharefs fd smbfs}.each do |ft|
+    %w{tmpfs nfs ctfs proc mntfs objfs sharefs fd smbfs vxfs}.each do |ft|
       context "when the device has a fstype of #{ft}" do
         let(:fstype) { ft }
+        let(:fsck_device) { "-" }
         let(:device) { "something_that_is_not_a_file" }
 
         before do
@@ -145,7 +149,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
   end
 
   describe "#load_current_resource" do
-    context "when loading a normal UFS filesystem" do
+    context "when loading a normal UFS filesystem with mount at boot" do
 
       before do
         provider.load_current_resource
@@ -167,6 +171,10 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         provider.current_resource.device.should == device
       end
 
+      it "should set the fsck_device on the current_resource" do
+        provider.current_resource.fsck_device.should == fsck_device
+      end
+
       it "should set the device_type on the current_resource" do
         provider.current_resource.device_type.should == device_type
       end
@@ -184,7 +192,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       end
 
       it "should set the options field on the current_resource" do
-        expect(provider.current_resource.options).to eql(["-", "noauto"])
+        expect(provider.current_resource.options).to eql(["-"])
       end
 
       it "should set the pass field on the current_resource" do
@@ -201,6 +209,39 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         expect { provider.load_current_resource }.to_not raise_error
       end
     end
+  end
+
+  describe "#load_current_resource" do
+    context "when loading a normal UFS filesystem with noauto, don't mount at boot" do
+
+      let(:vfstab_file_contents) {
+        <<-EOF.gsub /^\s*/, ''
+        #device         device          mount           FS      fsck    mount   mount
+        #to mount       to fsck         point           type    pass    at boot options
+        #
+        fd      -       /dev/fd fd      -       no      -
+        /proc   -       /proc   proc    -       no      -
+        # swap
+        /dev/dsk/c0t0d0s1       -       -       swap    -       no      -
+        # root
+        /dev/dsk/c0t0d0s0       /dev/rdsk/c0t0d0s0      /       ufs     1       no      -
+        # tmpfs
+        swap    -       /tmp    tmpfs   -       yes     -
+        # nfs
+        cartman:/share2         -                       /cartman        nfs     -       yes     rw,soft
+        # ufs
+        /dev/dsk/c0t2d0s7       /dev/rdsk/c0t2d0s7      /mnt/foo            ufs     2       no     -
+        EOF
+      }
+
+      before do
+        provider.load_current_resource
+      end
+
+      it "should set the options field on the current_resource" do
+        expect(provider.current_resource.options).to eql(["-", "noauto"])
+      end
+    end
 
     context "when the device is an smbfs mount" do
       let(:mount_output) {
@@ -214,6 +255,8 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         EOF
       }
 
+      let(:fsck_device) { "-" }
+
       it "should work at some point in the future" do
         pending "SMBFS mounts on solaris look like they will need some future code work and more investigation"
       end
@@ -232,6 +275,8 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         EOF
       }
 
+      let(:fsck_device) { "-" }
+
       let(:fstype) { "nfs" }
 
       let(:device) { "cartman:/share2" }
@@ -271,11 +316,15 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       end
 
       it "should set the options field on the current_resource" do
-        expect(provider.current_resource.options).to eql(["rw", "soft", "noauto"])
+        expect(provider.current_resource.options).to eql(["rw", "soft"])
       end
 
       it "should set the pass field on the current_resource" do
         # is this correct or should it be nil?
+        #
+        # vfstab man page says. 
+        # "A -  is used to indicate no entry in a field."
+        # 0 and - could mean different things for some file systems
         expect(provider.current_resource.pass).to eql(0)
       end
 
@@ -313,7 +362,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       end
 
       it "should have the correct mount options" do
-        expect(provider.current_resource.options).to eql(["-", "noauto"])
+        expect(provider.current_resource.options).to eql(["-"])
       end
     end
 
@@ -350,7 +399,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       end
 
       it "should have the correct mount options" do
-        expect(provider.current_resource.options).to eql(["-", "noauto"])
+        expect(provider.current_resource.options).to eql(["-"])
       end
     end
 
@@ -515,8 +564,33 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       end
     end
 
-    describe "remount_fs" do
+    describe "remount_fs without options and do not mount at boot" do
       it "should use mount -o remount" do
+        new_resource.options(%w{noauto})
+        provider.should_receive(:shell_out!).with("mount -o remount #{new_resource.mount_point}")
+        provider.remount_fs
+      end
+    end
+
+    describe "remount_fs with options and do not mount at boot" do
+      it "should use mount -o remount,rw" do
+        new_resource.options(%w{rw noauto})
+        provider.should_receive(:shell_out!).with("mount -o remount,rw #{new_resource.mount_point}")
+        provider.remount_fs
+      end
+    end
+
+    describe "remount_fs with options and mount at boot" do
+      it "should use mount -o remount,rw" do
+        new_resource.options(%w{rw})
+        provider.should_receive(:shell_out!).with("mount -o remount,rw #{new_resource.mount_point}")
+        provider.remount_fs
+      end
+    end
+
+    describe "remount_fs without options and mount at boot" do
+      it "should use mount -o remount" do
+        new_resource.options([])
         provider.should_receive(:shell_out!).with("mount -o remount #{new_resource.mount_point}")
         provider.remount_fs
       end
@@ -526,7 +600,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       context "in the typical case" do
         let(:other_mount) { "/dev/dsk/c0t2d0s0       /dev/rdsk/c0t2d0s0      /            ufs     2       yes     -" }
 
-        let(:this_mount) { "/dev/dsk/c0t2d0s7\t-\t/mnt/foo\tufs\t2\tyes\tdefaults\n" }
+        let(:this_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tyes\tdefaults\n" }
 
         let(:vfstab_file_contents) { [other_mount].join("\n") }
 
@@ -548,9 +622,9 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
       context "when the mount has options=noauto" do
         let(:other_mount) { "/dev/dsk/c0t2d0s0       /dev/rdsk/c0t2d0s0      /            ufs     2       yes     -" }
 
-        let(:this_mount) { "/dev/dsk/c0t2d0s7\t-\t/mnt/foo\tufs\t2\tno\t-\n" }
+        let(:this_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tno\t-\n" }
 
-        let(:options) { [ "noauto" ] }
+        let(:options) { "noauto" }
 
         let(:vfstab_file_contents) { [other_mount].join("\n") }
 
@@ -568,6 +642,106 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
           IO.read(vfstab_file.path).should match(/^#{Regexp.escape(this_mount)}/)
         end
       end
+
+      context "when the new mount has options of noauto and the existing mount has mount at boot yes" do
+        let(:existing_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tyes\t-" }
+
+        let(:this_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tno\t-\n" }
+
+        let(:options) { "noauto" }
+
+        let(:vfstab_file_contents) { [existing_mount].join("\n") }
+
+        before do
+          provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
+          provider.load_current_resource
+          provider.mount_options_unchanged?
+          provider.send(:vfstab_entry)
+        end
+
+        it "should detect a changed entry" do
+          provider.mount_options_unchanged?.should == false
+        end
+
+        it "should change mount at boot to no" do
+          provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
+        end
+      end
+
+      context "when the new mount has options of - and the existing mount has mount at boot no" do
+        let(:existing_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tno\t-" }
+
+        let(:this_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tyes\t-\n" }
+
+        let(:options) { "-" }
+
+        let(:vfstab_file_contents) { [existing_mount].join("\n") }
+
+        before do
+          provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
+          provider.load_current_resource
+          provider.mount_options_unchanged?
+          provider.send(:vfstab_entry)
+        end
+
+        it "should detect a changed entry" do
+          provider.mount_options_unchanged?.should == false
+        end
+
+        it "should change mount at boot to yes" do
+          provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
+        end
+      end
+
+      context "when the new mount has options of noauto and the existing mount has mount at boot no" do
+        let(:existing_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tno\t-" }
+
+        let(:this_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tno\t-\n" }
+
+        let(:options) { "-,noauto" }
+
+        let(:vfstab_file_contents) { [existing_mount].join("\n") }
+
+        before do
+          provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
+          provider.load_current_resource
+          provider.mount_options_unchanged?
+          provider.send(:vfstab_entry)
+        end
+
+        it "should detect an unchanged entry" do
+          provider.mount_options_unchanged?.should == true
+        end
+
+        it "should not change mount at boot" do
+          provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
+        end
+      end
+
+      context "when the new mount has options of - and the existing mount has mount at boot yes" do
+        let(:existing_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tyes\t-" }
+
+        let(:this_mount) { "/dev/dsk/c0t2d0s7\t/dev/rdsk/c0t2d0s7\t/mnt/foo\tufs\t2\tyes\t-\n" }
+
+        let(:options) { "-" }
+
+        let(:vfstab_file_contents) { [existing_mount].join("\n") }
+
+        before do
+          provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
+          provider.load_current_resource
+          provider.mount_options_unchanged?
+          provider.send(:vfstab_entry)
+        end
+
+        it "should detect an unchanged entry" do
+          provider.mount_options_unchanged?.should == true
+        end
+
+        it "should not change mount at boot" do
+          provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
+        end
+      end
     end
 
     describe "when disabling the fs" do