chef 12.6.0 → 12.7.2

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

@@ -1,5 +1,5 @@
 # Author:: Jay Mundrawala (<jdm@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software
+# Copyright:: Copyright 2015-2016, Chef Software
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/mixin/shell_out'
+require "spec_helper"
+require "chef/mixin/shell_out"
 
 describe Chef::Provider::User::Windows, :windows_only do
   include Chef::Mixin::ShellOut
 
-  let(:username) { 'ChefFunctionalTest' }
+  let(:username) { "ChefFunctionalTest" }
   let(:password) { SecureRandom.uuid }
 
   let(:node) do
@@ -47,84 +47,84 @@ describe Chef::Provider::User::Windows, :windows_only do
     delete_user(username)
   end
 
-  describe 'action :create' do
-    it 'creates a user when a username and password are given' do
+  describe "action :create" do
+    it "creates a user when a username and password are given" do
       new_resource.run_action(:create)
       expect(new_resource).to be_updated_by_last_action
       expect(shell_out("net user #{username}").exitstatus).to eq(0)
     end
 
-    it 'reports no changes if there are no changes needed' do
+    it "reports no changes if there are no changes needed" do
       new_resource.run_action(:create)
       new_resource.run_action(:create)
       expect(new_resource).not_to be_updated_by_last_action
     end
 
-    it 'allows chaning the password' do
+    it "allows chaning the password" do
       new_resource.run_action(:create)
       new_resource.password(SecureRandom.uuid)
       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
+    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.gid("agroup")
         new_resource.run_action(:create)
       end
     end
   end
 
-  describe 'action :remove' do
+  describe "action :remove" do
     before do
       new_resource.run_action(:create)
     end
 
-    it 'deletes the user' do
+    it "deletes the user" do
       new_resource.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
       expect(shell_out("net user #{username}").exitstatus).to eq(2)
     end
 
-    it 'is idempotent' do
+    it "is idempotent" do
       new_resource.run_action(:remove)
       new_resource.run_action(:remove)
       expect(new_resource).not_to be_updated_by_last_action
     end
   end
 
-  describe 'action :lock' do
+  describe "action :lock" do
     before do
       new_resource.run_action(:create)
     end
 
-    it 'locks the user account' do
+    it "locks the user account" do
       new_resource.run_action(:lock)
       expect(new_resource).to be_updated_by_last_action
       expect(shell_out("net user #{username}").stdout).to match(/Account active\s*No/)
     end
 
-    it 'is idempotent' do
+    it "is idempotent" do
       new_resource.run_action(:lock)
       new_resource.run_action(:lock)
       expect(new_resource).not_to be_updated_by_last_action
     end
   end
 
-  describe 'action :unlock' do
+  describe "action :unlock" do
     before do
       new_resource.run_action(:create)
       new_resource.run_action(:lock)
     end
 
-    it 'unlocks the user account' do
+    it "unlocks the user account" do
       new_resource.run_action(:unlock)
       expect(new_resource).to be_updated_by_last_action
       expect(shell_out("net user #{username}").stdout).to match(/Account active\s*Yes/)
     end
 
-    it 'is idempotent' do
+    it "is idempotent" do
       new_resource.run_action(:unlock)
       new_resource.run_action(:unlock)
       expect(new_resource).not_to be_updated_by_last_action

data/spec/functional/resource/windows_package_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'functional/resource/base'
+require "spec_helper"
+require "functional/resource/base"
 
 describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
   let(:pkg_name) { nil }
@@ -29,7 +29,7 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
 
   subject do
     new_resource = Chef::Resource::WindowsPackage.new(pkg_name, run_context)
-    new_resource.source pkg_path
+    new_resource.source pkg_path if pkg_path
     new_resource.version pkg_version
     new_resource.installer_type pkg_type
     new_resource.options pkg_options
@@ -37,11 +37,11 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
     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' }
+  describe "install package" do
+    let(:pkg_name) { "Microsoft Visual C++ 2005 Redistributable" }
+    let(:pkg_checksum) { "d6832398e3bc9156a660745f427dc1c2392ce4e9a872e04f41f62d0c6bae07a8" }
+    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" }
 
@@ -56,8 +56,9 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
     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' }
+      let(:pkg_path) { "https://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe" }
+      let(:pkg_checksum) { "eb00f891919d4f894ab725b158459db8834470c382dc60cd3c3ee2c6de6da92c" }
+      let(:pkg_version) { "8.0.56336" }
 
       it "installs older version" do
         subject.run_action(:install)
@@ -69,14 +70,14 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile 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')}
+        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']])
+          expect(prov.current_version_array).to eq([["8.0.59193"]])
         end
       end
 
@@ -101,8 +102,8 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
           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.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)
@@ -123,14 +124,9 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile 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
+      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 installer type" do
         subject.run_action(:install)
@@ -139,14 +135,9 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
     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
+      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 installer type" do
         subject.run_action(:install)
@@ -156,9 +147,9 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
   end
 
   describe "install from local file" do
-    let(:pkg_name) { 'Mercurial 3.6.1 (64-bit)' }
+    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' }
+    let(:pkg_checksum) { "febd29578cb6736163d232708b834a2ddd119aa40abc536b2c313fc5e1b5831d" }
 
     it "installs the app" do
       subject.run_action(:install)
@@ -167,11 +158,11 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
   end
 
   describe "uninstall exe without source" do
-    let(:pkg_name) { 'Mercurial 3.6.1 (64-bit)' }
+    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
+  end
+end

data/spec/functional/resource/windows_service_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Chris Doherty (<cdoherty@chef.io>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +16,16 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
-describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_gem_only, :appveyor_only do
+describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_gem_only, :appveyor_only, :broken => true do
+  # Marking as broken. This test is causing appveyor tests to exit with 116.
 
   include_context "using Win32::Service"
 
-  let(:username) { "service_spec_user"}
-  let(:qualified_username) { ".\\#{username}"}
-  let(:password) { "1a2b3c4X!&narf"}
+  let(:username) { "service_spec_user" }
+  let(:qualified_username) { "#{ENV['COMPUTERNAME']}\\#{username}" }
+  let(:password) { "1a2b3c4X!&narf" }
 
   let(:user_resource) {
     r = Chef::Resource::User.new(username, run_context)
@@ -49,7 +50,7 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
       service_display_name: "windows_service spec #{id}}",
       service_description: "Test service for running the windows_service functional spec.",
       service_file_path: global_service_file_path,
-      } )
+      }, )
   }
 
   let(:manager) {
@@ -93,6 +94,9 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
       service_resource.run_action(:start)
     end
 
-    it "raises an exception when it can't grant the logon privilege"
+    it "grants the user the log on as service right" do
+      service_resource.run_action(:start)
+      expect(Chef::ReservedNames::Win32::Security.get_account_right(qualified_username)).to include("SeServiceLogonRight")
+    end
   end
 end

data/spec/functional/rest_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Lamont Granquist (<lamont@getchef.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'tiny_server'
-require 'support/shared/functional/http'
+require "spec_helper"
+require "tiny_server"
+require "support/shared/functional/http"
 
 describe Chef::REST do
   include ChefHTTPShared
@@ -80,6 +80,7 @@ describe Chef::REST do
   before do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     Chef::Config[:client_key] = CHEF_SPEC_DATA + "/ssl/private_key.pem"
+    Chef::Config[:treat_deprecation_warnings_as_errors] = false
   end
 
   before(:all) do

data/spec/functional/run_lock_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path('../../spec_helper', __FILE__)
-require 'chef/client'
+require File.expand_path("../../spec_helper", __FILE__)
+require "chef/client"
 
 describe Chef::RunLock do
 
@@ -28,18 +28,19 @@ describe Chef::RunLock do
 
     let(:random_temp_root) do
       Kernel.srand(Time.now.to_i + Process.pid)
-      "/tmp/#{Kernel.rand(Time.now.to_i + Process.pid)}"
+      "#{Dir.tmpdir}/#{Kernel.rand(Time.now.to_i + Process.pid)}"
     end
 
-    let(:lockfile){ "#{random_temp_root}/this/long/path/does/not/exist/chef-client-running.pid" }
+    let(:lockfile) { "#{random_temp_root}/this/long/path/does/not/exist/chef-client-running.pid" }
 
     # make sure to start with a clean slate.
-    before(:each){ log_event("rm -rf before"); FileUtils.rm_r(random_temp_root) if File.exist?(random_temp_root) }
-    after(:each){ log_event("rm -rf after"); FileUtils.rm_r(random_temp_root) if File.exist?(random_temp_root) }
+    before(:each) { log_event("rm -rf before"); FileUtils.rm_r(random_temp_root) if File.exist?(random_temp_root) }
+    after(:each) { log_event("rm -rf after"); FileUtils.rm_r(random_temp_root) if File.exist?(random_temp_root) }
 
-    def log_event(message, time=Time.now.strftime("%H:%M:%S.%L"))
+    def log_event(message, time = Time.now.strftime("%H:%M:%S.%L"))
       events << [ message, time ]
     end
+
     def events
       @events ||= []
     end
@@ -59,8 +60,8 @@ describe Chef::RunLock do
     BREATHING_ROOM = 1
 
     # ClientProcess is defined below
-    let!(:p1) { ClientProcess.new(self, 'p1') }
-    let!(:p2) { ClientProcess.new(self, 'p2') }
+    let!(:p1) { ClientProcess.new(self, "p1") }
+    let!(:p2) { ClientProcess.new(self, "p2") }
     after(:each) do |example|
       begin
         p1.stop
@@ -103,7 +104,7 @@ describe Chef::RunLock do
           end
 
           it "the lockfile is empty" do
-            expect(IO.read(lockfile)).to eq('')
+            expect(IO.read(lockfile)).to eq("")
           end
 
           context "and a second client gets the lock" do
@@ -157,7 +158,7 @@ describe Chef::RunLock do
         end
 
         it "the lockfile is empty" do
-          expect(IO.read(lockfile)).to eq('')
+          expect(IO.read(lockfile)).to eq("")
         end
 
         it "and a second client tries to acquire the lock, it doesn't get the lock until *after* the first client exits" do
@@ -321,7 +322,7 @@ describe Chef::RunLock do
     attr_reader :pid
 
     def last_event
-      while true
+      loop do
         line = readline_nonblock(read_from_process)
         break if line.nil?
         event, time = line.split("@")

data/spec/functional/shell_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,11 @@
 # limitations under the License.
 #
 
-require 'functional/resource/base'
-require 'chef/version'
-require 'chef/shell'
-require 'chef/mixin/command/unix'
+require "spec_helper"
+require "functional/resource/base"
+require "chef/version"
+require "chef/shell"
+require "chef/mixin/command/unix"
 
 describe Shell do
 
@@ -29,7 +30,7 @@ describe Shell do
   describe "smoke tests", :unix_only => true do
     include Chef::Mixin::Command::Unix
 
-    TIMEOUT=300
+    TIMEOUT = 300
 
     def read_until(io, expected_value)
       start = Time.new
@@ -42,7 +43,7 @@ describe Shell do
         end
         if Time.new - start > TIMEOUT
           raise "did not read expected value `#{expected_value}' within #{TIMEOUT}s\n" +
-                "Buffer so far: `#{buffer}'"
+            "Buffer so far: `#{buffer}'"
         end
       end
       buffer
@@ -82,7 +83,7 @@ describe Shell do
       when "aix"
         config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
         path_to_chef_shell = File.expand_path("../../../bin/chef-shell", __FILE__)
-        output = ''
+        output = ""
         status = popen4("#{path_to_chef_shell} -c #{config} #{options}", :waitlast => true) do |pid, stdin, stdout, stderr|
           read_until(stdout, "chef (#{Chef::VERSION})>")
           yield stdout, stdin if block_given?
@@ -97,7 +98,7 @@ describe Shell do
         # Windows ruby installs don't (always?) have PTY,
         # so hide the require here
         begin
-          require 'pty'
+          require "pty"
           config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
           path_to_chef_shell = File.expand_path("../../../bin/chef-shell", __FILE__)
           reader, writer, pid = PTY.spawn("#{path_to_chef_shell} -c #{config} #{options}")