chef 12.5.1-universal-mingw32 → 12.6.0-universal-mingw32

data/spec/functional/resource/ifconfig_spec.rb

@@ -22,7 +22,9 @@ require 'chef/mixin/shell_out'
 # run this test only for following platforms.
 include_flag = !(['ubuntu', 'centos', 'aix'].include?(ohai[:platform]))
 
-describe Chef::Resource::Ifconfig, :requires_root, :external => include_flag do
+describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, :external => include_flag do
+  # This test does not work in travis because there is no eth0
+
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do

data/spec/functional/resource/mount_spec.rb

@@ -21,9 +21,11 @@ require 'chef/mixin/shell_out'
 require 'tmpdir'
 
 # run this test only for following platforms.
-include_flag = !(['ubuntu', 'centos', 'aix', 'solaris2'].include?(ohai[:platform]))
+include_flag = !(['ubuntu', 'centos', 'solaris2'].include?(ohai[:platform]))
 
-describe Chef::Resource::Mount, :requires_root, :external => include_flag do
+describe Chef::Resource::Mount, :requires_root, :skip_travis, :external => include_flag do
+  # Disabled in travis because it refuses to let us mount a ramdisk. /dev/ramX does not
+  # exist even after loading the kernel module
 
   include Chef::Mixin::ShellOut
 
@@ -32,6 +34,7 @@ describe Chef::Resource::Mount, :requires_root, :external => include_flag do
   def setup_device_for_mount
     # use ramdisk for creating a test device for mount.
     # This can cleaner if we have chef resource/provider for ramdisk.
+    # TODO: These tests only work in LPARs, not WPARs on AIX.
     case ohai[:platform]
     when "aix"
       ramdisk = shell_out!("mkramdisk 16M").stdout

data/spec/functional/resource/package_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
 # Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/functional/resource/user/windows_spec.rb

@@ -66,6 +66,14 @@ describe Chef::Provider::User::Windows, :windows_only do
       new_resource.run_action(:create)
       expect(new_resource).to be_updated_by_last_action
     end
+
+    context 'with a gid specified' do
+      it 'warns unsupported' do
+        expect(Chef::Log).to receive(:warn).with(/not implemented/)
+        new_resource.gid('agroup')
+        new_resource.run_action(:create)
+      end
+    end
   end
 
   describe 'action :remove' do

data/spec/functional/resource/windows_package_spec.rb

@@ -0,0 +1,177 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'functional/resource/base'
+
+describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
+  let(:pkg_name) { nil }
+  let(:pkg_path) { nil }
+  let(:pkg_checksum) { nil }
+  let(:pkg_version) { nil }
+  let(:pkg_type) { nil }
+  let(:pkg_options) { nil }
+
+  subject do
+    new_resource = Chef::Resource::WindowsPackage.new(pkg_name, run_context)
+    new_resource.source pkg_path
+    new_resource.version pkg_version
+    new_resource.installer_type pkg_type
+    new_resource.options pkg_options
+    new_resource.checksum pkg_checksum
+    new_resource
+  end
+
+  describe "multi package scenario" do
+    let(:pkg_name) { 'Microsoft Visual C++ 2005 Redistributable' }
+    let(:pkg_path) { 'https://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe' }
+    let(:pkg_checksum) { nil }
+    let(:pkg_version) { '8.0.59193' }
+    let(:pkg_type) { :custom }
+    let(:pkg_options) { "/Q" }
+
+    it "updates resource on first install" do
+      subject.run_action(:install)
+      expect(subject).to be_updated_by_last_action
+    end
+
+    it "does not update resource when already installed" do
+      subject.run_action(:install)
+      expect(subject).not_to be_updated_by_last_action
+    end
+
+    context "installing additional version" do
+      let(:pkg_path) { 'https://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe' }
+      let(:pkg_version) { '8.0.56336' }
+
+      it "installs older version" do
+        subject.run_action(:install)
+        expect(subject).to be_updated_by_last_action
+      end
+    end
+
+    describe "removing package" do
+      subject { Chef::Resource::WindowsPackage.new(pkg_name, run_context) }
+
+      context "multiple versions and a version given to remove" do
+        before { subject.version('8.0.56336')}
+
+        it "removes specified version" do
+          subject.run_action(:remove)
+          expect(subject).to be_updated_by_last_action
+          prov = subject.provider_for_action(:remove)
+          prov.load_current_resource
+          expect(prov.current_version_array).to eq([['8.0.59193']])
+        end
+      end
+
+      context "single version installed and no version given to remove" do
+        it "removes last remaining version" do
+          subject.run_action(:remove)
+          expect(subject).to be_updated_by_last_action
+          prov = subject.provider_for_action(:remove)
+          prov.load_current_resource
+          expect(prov.current_version_array).to eq([nil])
+        end
+      end
+
+      describe "removing multiple versions at once" do
+        let(:pkg_version) { nil }
+        before do
+          install1 = Chef::Resource::WindowsPackage.new(pkg_name, run_context)
+          install1.source pkg_path
+          install1.version pkg_version
+          install1.installer_type pkg_type
+          install1.options pkg_options
+          install1.run_action(:install)
+
+          install2 = Chef::Resource::WindowsPackage.new(pkg_name, run_context)
+          install2.source 'https://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe'
+          install2.version '8.0.56336'
+          install2.installer_type pkg_type
+          install2.options pkg_options
+          install2.run_action(:install)
+        end
+
+        it "removes all versions" do
+          subject.run_action(:remove)
+          expect(subject).to be_updated_by_last_action
+          prov = subject.provider_for_action(:remove)
+          prov.load_current_resource
+          expect(prov.current_version_array).to eq([nil])
+        end
+      end
+    end
+  end
+
+  describe "package version and installer type" do
+    after { subject.run_action(:remove) }
+
+    context "null soft" do
+      let(:pkg_name) { 'Ultra Defragmenter' }
+      let(:pkg_path) { 'http://iweb.dl.sourceforge.net/project/ultradefrag/stable-release/6.1.1/ultradefrag-6.1.1.bin.amd64.exe' }
+      let(:pkg_checksum) { '11d53ed4c426c8c867ad43f142b7904226ffd9938c02e37086913620d79e3c09' }
+      
+      it "finds the correct package version" do
+        subject.run_action(:install)
+        expect(subject.version).to eq('6.1.1')
+      end
+
+      it "finds the correct installer type" do
+        subject.run_action(:install)
+        expect(subject.provider_for_action(:install).installer_type).to eq(:nsis)
+      end
+    end
+
+    context "inno" do
+      let(:pkg_name) { 'Mercurial 3.6.1 (64-bit)' }
+      let(:pkg_path) { 'http://mercurial.selenic.com/release/windows/Mercurial-3.6.1-x64.exe' }
+      let(:pkg_checksum) { 'febd29578cb6736163d232708b834a2ddd119aa40abc536b2c313fc5e1b5831d' }
+
+      it "finds the correct package version" do
+        subject.run_action(:install)
+        expect(subject.version).to eq(nil) # Mercurial does not include versioning
+      end
+
+      it "finds the correct installer type" do
+        subject.run_action(:install)
+        expect(subject.provider_for_action(:install).installer_type).to eq(:inno)
+      end
+    end
+  end
+
+  describe "install from local file" do
+    let(:pkg_name) { 'Mercurial 3.6.1 (64-bit)' }
+    let(:pkg_path) { ::File.join(Chef::Config[:file_cache_path], "package", "Mercurial-3.6.1-x64.exe") }
+    let(:pkg_checksum) { 'febd29578cb6736163d232708b834a2ddd119aa40abc536b2c313fc5e1b5831d' }
+
+    it "installs the app" do
+      subject.run_action(:install)
+      expect(subject).to be_updated_by_last_action
+    end
+  end
+
+  describe "uninstall exe without source" do
+    let(:pkg_name) { 'Mercurial 3.6.1 (64-bit)' }
+
+    it "uninstalls the app" do
+      subject.run_action(:remove)
+      expect(subject).to be_updated_by_last_action
+    end
+  end  
+end

data/spec/functional/win32/version_info_spec.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+if Chef::Platform.windows?
+  require 'chef/win32/file/version_info'
+end
+
+describe "Chef::ReservedNames::Win32::File::VersionInfo", :windows_only do
+  require 'wmi-lite/wmi'
+  let(:file_path) { ENV['ComSpec'] }
+  let(:os_version) do
+    wmi = WmiLite::Wmi.new
+    os_info = wmi.first_of('Win32_OperatingSystem')
+    os_info['version']
+  end
+
+  subject { Chef::ReservedNames::Win32::File::VersionInfo.new(file_path) }
+
+  it "file version has the same version as windows" do
+    expect(subject.FileVersion).to start_with(os_version)
+  end
+
+  it "product version has the same version as windows" do
+    expect(subject.ProductVersion).to start_with(os_version)
+  end
+
+  it "company is microsoft" do
+    expect(subject.CompanyName).to eq("Microsoft Corporation")
+  end
+
+  it "file description is command processor" do
+    expect(subject.FileDescription).to eq("Windows Command Processor")
+  end
+end

data/spec/integration/client/client_spec.rb

@@ -301,6 +301,86 @@ EOM
       result.error!
     end
 
+    it "should complete with success when using --profile-ruby and output a profile file" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+      result = shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z --profile-ruby", :cwd => chef_dir)
+      expect(File.exist?(path_to("config/local-mode-cache/cache/graph_profile.out"))).to be true
+    end
+
+    it "doesn't produce a profile when --profile-ruby is not present" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+      result = shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
+      expect(File.exist?(path_to("config/local-mode-cache/cache/graph_profile.out"))).to be false
+    end
+  end
+
+  when_the_repository "has a cookbook that should fail chef_version checks" do
+    before do
+      file 'cookbooks/x/recipes/default.rb', ''
+      file 'cookbooks/x/metadata.rb', <<EOM
+name 'x'
+version '0.0.1'
+chef_version '~> 999.99'
+EOM
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+    end
+    it "should fail the chef client run" do
+      command = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --no-fork", :cwd => chef_dir)
+      expect(command.exitstatus).to eql(1)
+      expect(command.stdout).to match(/Chef::Exceptions::CookbookChefVersionMismatch/)
+    end
+  end
+
+  when_the_repository "has a cookbook that uses cheffish resources" do
+    before do
+      file 'cookbooks/x/recipes/default.rb', <<-EOM
+        raise "Cheffish was loaded before we used any cheffish things!" if defined?(Cheffish::VERSION)
+        ran_block = false
+        got_server = with_chef_server 'https://blah.com' do
+          ran_block = true
+          run_context.cheffish.current_chef_server
+        end
+        raise "with_chef_server block was not run!" if !ran_block
+        raise "Cheffish was not loaded when we did cheffish things!" if !defined?(Cheffish::VERSION)
+        raise "current_chef_server did not return its value!" if got_server[:chef_server_url] != 'https://blah.com'
+      EOM
+      file 'config/client.rb', <<-EOM
+        local_mode true
+        cookbook_path "#{path_to('cookbooks')}"
+      EOM
+    end
+
+    it "the cheffish DSL is loaded lazily" do
+      command = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --no-fork", :cwd => chef_dir)
+      expect(command.exitstatus).to eql(0)
+    end
+  end
+
+  when_the_repository "has a cookbook that uses chef-provisioning resources" do
+    before do
+      file 'cookbooks/x/recipes/default.rb', <<-EOM
+        with_driver 'blah'
+      EOM
+      file 'config/client.rb', <<-EOM
+        local_mode true
+        cookbook_path "#{path_to('cookbooks')}"
+      EOM
+    end
+
+    it "the cheffish DSL tries to load but fails (because chef-provisioning is not there)" do
+      command = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --no-fork", :cwd => chef_dir)
+      expect(command.exitstatus).to eql(1)
+      expect(command.stdout).to match(/cannot load such file -- chef\/provisioning/)
+    end
   end
 
   when_the_repository "has a cookbook that generates deprecation warnings" do

data/spec/integration/knife/download_spec.rb

@@ -1103,6 +1103,15 @@ EOM
     before :each do
       Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo')
     end
+    when_the_repository 'has existing top level files' do
+      before do
+        file 'invitations.json', {}
+      end
+
+      it "can still download top level files" do
+        knife('download /invitations.json').should_succeed
+      end
+    end
 
     when_the_repository 'is empty' do
       it 'knife download / downloads everything' do

data/spec/integration/knife/upload_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -699,6 +699,19 @@ EOH
         end
       end
     end
+    when_the_chef_server "is empty" do
+      when_the_repository 'has a cookbook with an invalid chef_version constraint in it' do
+        before do
+          file 'cookbooks/x/metadata.rb', cb_metadata('x', '1.0.0', "\nchef_version '~> 999.0'")
+        end
+        it 'knife upload succeeds' do
+          knife('upload /cookbooks/x').should_succeed <<EOM
+Created /cookbooks/x
+EOM
+          knife('diff --name-status /cookbooks').should_succeed ''
+        end
+      end
+    end
   end # without versioned cookbooks
 
   with_versioned_cookbooks do
@@ -1219,6 +1232,20 @@ EOM
         end
       end
     end
+
+    when_the_chef_server "is empty" do
+      when_the_repository 'has a cookbook with an invalid chef_version constraint in it' do
+        before do
+          file 'cookbooks/x-1.0.0/metadata.rb', cb_metadata('x', '1.0.0', "\nchef_version '~> 999.0'")
+        end
+        it 'knife upload succeeds' do
+          knife('upload /cookbooks/x-1.0.0').should_succeed <<EOM
+Created /cookbooks/x-1.0.0
+EOM
+          knife('diff --name-status /cookbooks').should_succeed ''
+        end
+      end
+    end
   end # with versioned cookbooks
 
   when_the_chef_server 'has a user' do

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -18,35 +18,105 @@ describe "LWRPs with inline resources" do
   # cf. CHEF-4914
   let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" }
 
+  context "with a use_inline_resources provider with 'def action_a' instead of action :a" do
+    class LwrpInlineResourcesTest < Chef::Resource::LWRPBase
+      resource_name :lwrp_inline_resources_test
+      actions :a, :nothing
+      default_action :a
+      property :ran_a
+      class Provider < Chef::Provider::LWRPBase
+        provides :lwrp_inline_resources_test
+        use_inline_resources
+        def action_a
+          r = new_resource
+          ruby_block 'run a' do
+            block { r.ran_a "ran a" }
+          end
+        end
+      end
+    end
+
+    it "this is totally a bug, but for backcompat purposes, it adds the resources to the main resource collection and does not get marked updated" do
+      r = nil
+      expect_recipe {
+        r = lwrp_inline_resources_test 'hi'
+      }.to have_updated('ruby_block[run a]', :run)
+      expect(r.ran_a).to eq "ran a"
+    end
+  end
+
+  context "with an inline_resources provider with two actions, one calling the other" do
+    class LwrpInlineResourcesTest2 < Chef::Resource::LWRPBase
+      resource_name :lwrp_inline_resources_test2
+      actions :a, :b, :nothing
+      default_action :b
+      property :ran_a
+      property :ran_b
+      class Provider < Chef::Provider::LWRPBase
+        provides :lwrp_inline_resources_test2
+        use_inline_resources
+
+        action :a do
+          r = new_resource
+          ruby_block 'run a' do
+            block { r.ran_a "ran a" }
+          end
+        end
+
+        action :b do
+          action_a
+          r = new_resource
+          # Grab ran_a right now, before we converge
+          ran_a = r.ran_a
+          ruby_block 'run b' do
+            block { r.ran_b "ran b: ran_a value was #{ran_a.inspect}" }
+          end
+        end
+      end
+    end
+
+    it "resources declared in b are executed immediately inline" do
+      r = nil
+      expect_recipe {
+        r = lwrp_inline_resources_test2 'hi' do
+          action :b
+        end
+      }.to have_updated('lwrp_inline_resources_test2[hi]', :b).
+       and have_updated('ruby_block[run a]', :run).
+       and have_updated('ruby_block[run b]', :run)
+      expect(r.ran_b).to eq "ran b: ran_a value was \"ran a\""
+    end
+  end
+
   when_the_repository "has a cookbook with a nested LWRP" do
     before do
       directory 'cookbooks/x' do
 
-        file 'resources/do_nothing.rb', <<EOM
-actions :create, :nothing
-default_action :create
-EOM
-        file 'providers/do_nothing.rb', <<EOM
-action :create do
-end
-EOM
+        file 'resources/do_nothing.rb', <<-EOM
+          actions :create, :nothing
+          default_action :create
+        EOM
+        file 'providers/do_nothing.rb', <<-EOM
+          action :create do
+          end
+        EOM
 
-        file 'resources/my_machine.rb', <<EOM
-actions :create, :nothing
-default_action :create
-EOM
-        file 'providers/my_machine.rb', <<EOM
-use_inline_resources
-action :create do
-  x_do_nothing 'a'
-  x_do_nothing 'b'
-end
-EOM
+        file 'resources/my_machine.rb', <<-EOM
+          actions :create, :nothing
+          default_action :create
+        EOM
+        file 'providers/my_machine.rb', <<-EOM
+          use_inline_resources
+          action :create do
+            x_do_nothing 'a'
+            x_do_nothing 'b'
+          end
+        EOM
 
-        file 'recipes/default.rb', <<EOM
-x_my_machine "me"
-x_my_machine "you"
-EOM
+        file 'recipes/default.rb', <<-EOM
+          x_my_machine "me"
+          x_my_machine "you"
+        EOM
 
       end # directory 'cookbooks/x'
     end