chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

data/spec/unit/node_map_spec.rb

@@ -104,8 +104,8 @@ describe Chef::NodeMap do
     end
 
     it "returns nil when the platform_family does not match" do
-      allow(node).to receive(:[]).with(:os).and_return("linux")
-      allow(node).to receive(:[]).with(:platform_family).and_return("debian")
+      node.automatic["os"] = "linux"
+      node.automatic["platform_family"] = "debian"
       expect(node_map.get(node, :thing)).to eql(nil)
     end
   end
@@ -174,26 +174,26 @@ describe Chef::NodeMap do
     end
 
     it "returns the value when the node matches" do
-      allow(node).to receive(:[]).with(:platform_family).and_return("rhel")
-      allow(node).to receive(:[]).with(:platform_version).and_return("7.0")
+      node.automatic["platform_family"] = "rhel"
+      node.automatic["platform_version"] = "7.0"
       expect(node_map.get(node, :thing)).to eql(:foo)
     end
 
     it "returns nil when the block does not match" do
-      allow(node).to receive(:[]).with(:platform_family).and_return("rhel")
-      allow(node).to receive(:[]).with(:platform_version).and_return("6.4")
+      node.automatic["platform_family"] = "rhel"
+      node.automatic["platform_version"] = "6.4"
       expect(node_map.get(node, :thing)).to eql(nil)
     end
 
     it "returns nil when the platform_family filter does not match" do
-      allow(node).to receive(:[]).with(:platform_family).and_return("debian")
-      allow(node).to receive(:[]).with(:platform_version).and_return("7.0")
+      node.automatic["platform_family"] = "debian"
+      node.automatic["platform_version"] = "7.0"
       expect(node_map.get(node, :thing)).to eql(nil)
     end
 
     it "returns nil when both do not match" do
-      allow(node).to receive(:[]).with(:platform_family).and_return("debian")
-      allow(node).to receive(:[]).with(:platform_version).and_return("6.0")
+      node.automatic["platform_family"] = "debian"
+      node.automatic["platform_version"] = "6.0"
       expect(node_map.get(node, :thing)).to eql(nil)
     end
 
@@ -203,8 +203,8 @@ describe Chef::NodeMap do
       end
 
       it "returns the value when the node matches" do
-        allow(node).to receive(:[]).with(:platform_family).and_return("rhel")
-        allow(node).to receive(:[]).with(:platform_version).and_return("7.0")
+        node.automatic["platform_family"] = "rhel"
+        node.automatic["platform_version"] = "7.0"
         expect(node_map.get(node, :thing)).to eql(:foo)
       end
     end

data/spec/unit/platform/query_helpers_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,13 +43,13 @@ describe "Chef::Platform#windows_nano_server?" do
   end
 
   it "returns false early when not on windows" do
-    allow(ChefConfig).to receive(:windows?).and_return(false)
+    allow(ChefUtils).to receive(:windows?).and_return(false)
     expect(Chef::Platform).to_not receive(:require)
     expect(Chef::Platform.windows_nano_server?).to be false
   end
 
   it "returns true when the registry value is 1" do
-    allow(ChefConfig).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::Platform).to receive(:require).with("win32/registry")
     expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
       .with(key, access)
@@ -59,7 +59,7 @@ describe "Chef::Platform#windows_nano_server?" do
   end
 
   it "returns false when the registry value is not 1" do
-    allow(ChefConfig).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::Platform).to receive(:require).with("win32/registry")
     expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
       .with(key, access)
@@ -69,7 +69,7 @@ describe "Chef::Platform#windows_nano_server?" do
   end
 
   it "returns false when the registry value does not exist" do
-    allow(ChefConfig).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::Platform).to receive(:require).with("win32/registry")
     expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
       .with(key, access)
@@ -80,7 +80,7 @@ describe "Chef::Platform#windows_nano_server?" do
   end
 
   it "returns false when the registry key does not exist" do
-    allow(ChefConfig).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::Platform).to receive(:require).with("win32/registry")
     expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
       .with(key, access)
@@ -114,13 +114,13 @@ describe "Chef::Platform#supports_msi?" do
   end
 
   it "returns false early when not on windows" do
-    allow(ChefConfig).to receive(:windows?).and_return(false)
+    allow(ChefUtils).to receive(:windows?).and_return(false)
     expect(Chef::Platform).to_not receive(:require)
     expect(Chef::Platform.supports_msi?).to be false
   end
 
   it "returns true when the registry key exists" do
-    allow(ChefConfig).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::Platform).to receive(:require).with("win32/registry")
     expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
       .with(key, access)
@@ -129,7 +129,7 @@ describe "Chef::Platform#supports_msi?" do
   end
 
   it "returns false when the registry key does not exist" do
-    allow(ChefConfig).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::Platform).to receive(:require).with("win32/registry")
     expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
       .with(key, access)

data/spec/unit/provider/execute_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Provider::Execute do
 
   before do
     allow(Chef::EventDispatch::EventsOutputStream).to receive(:new) { @live_stream }
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
     @original_log_level = Chef::Log.level
     Chef::Log.level = :info
     allow(STDOUT).to receive(:tty?).and_return(false)

data/spec/unit/provider/link_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ require "ostruct"
 
 require "spec_helper"
 
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/file" # probably need this in spec_helper
 end
 
@@ -41,7 +41,7 @@ describe Chef::Resource::Link do
   end
 
   def canonicalize(path)
-    Chef::Platform.windows? ? path.tr("/", '\\') : path
+    ChefUtils.windows? ? path.tr("/", '\\') : path
   end
 
   describe "when the target is a symlink" do
@@ -359,7 +359,7 @@ describe Chef::Resource::Link do
           provider.new_resource.name
         ).and_return(resource_link)
         allow(resource_link).to receive(:verify_links_supported!)
-        allow(Chef::Platform).to receive(:windows?).and_return(true)
+        allow(ChefUtils).to receive(:windows?).and_return(true)
       end
 
       context "soft links" do
@@ -389,7 +389,7 @@ describe Chef::Resource::Link do
 
     context "on Linux platform" do
       before(:each) do
-        allow(Chef::Platform).to receive(:windows?).and_return(false)
+        allow(ChefUtils).to receive(:windows?).and_return(false)
       end
 
       context "soft links" do

data/spec/unit/provider/package/openbsd_spec.rb

@@ -120,7 +120,7 @@ describe Chef::Provider::Package::Openbsd do
   describe "delete a package" do
     before do
       @name = "ihavetoes"
-      @new_resource     = Chef::Resource::Package.new(@name)
+      @new_resource = Chef::Resource::Package.new(@name)
       @current_resource = Chef::Resource::Package.new(@name)
       @provider = Chef::Provider::Package::Openbsd.new(@new_resource, @run_context)
       @provider.current_resource = @current_resource

data/spec/unit/provider/package/smartos_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource     = Chef::Resource::Package.new("varnish")
+    @new_resource = Chef::Resource::Package.new("varnish")
     @current_resource = Chef::Resource::Package.new("varnish")
 
     @status = double("Status", exitstatus: 0)

data/spec/unit/provider/package/windows/exe_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 require "chef/provider/package/windows/exe"
 
-unless Chef::Platform.windows?
+unless ChefUtils.windows?
   class Chef
     module ReservedNames::Win32
       class File

data/spec/unit/provider/package/windows_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2014-2017, Chef Software Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ require "chef/provider/package/windows/msi"
 
 describe Chef::Provider::Package::Windows, :windows_only do
   before(:each) do
-    allow(Chef::Util::PathHelper).to receive(:windows?).and_return(true)
+    allow(ChefUtils).to receive(:windows?).and_return(true)
     allow(Chef::FileCache).to receive(:create_cache_path).with("package/").and_return(cache_path)
   end
 

data/spec/unit/provider/remote_file/fetcher_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   describe "when passed a network share" do
     before do
       expect(Chef::Provider::RemoteFile::NetworkFile).to receive(:new).and_return(fetcher_instance)
-      allow(Chef::Platform).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
     end
 
     context "when host is a name" do

data/spec/unit/provider/remote_file/local_file_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Provider::RemoteFile::LocalFile do
   context "when parsing source path on windows" do
 
     before do
-      allow(Chef::Platform).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
     end
 
     describe "when given local unix path" do

data/spec/unit/provider/remote_file/network_file_spec.rb

@@ -33,7 +33,7 @@ describe Chef::Provider::RemoteFile::NetworkFile do
     let(:source_file) { double("::File", read: nil) }
 
     before do
-      allow(Chef::Platform).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
     end
 
     it "stages the local file to a temporary file" do

data/spec/unit/provider/script_spec.rb

@@ -59,7 +59,7 @@ describe Chef::Provider::Script, "action_run" do
   context "when configuring the script file's security" do
     context "when not running on Windows" do
       before do
-        allow(::Chef::Platform).to receive(:windows?).and_return(false)
+        allow(ChefUtils).to receive(:windows?).and_return(false)
       end
       context "#set_owner_and_group" do
         it "sets the owner and group for the script file" do
@@ -73,7 +73,7 @@ describe Chef::Provider::Script, "action_run" do
 
     context "when running on Windows" do
       before do
-        allow(::Chef::Platform).to receive(:windows?).and_return(true)
+        allow(ChefUtils).to receive(:windows?).and_return(true)
         expect(new_resource.user).to eq(nil)
         stub_const("Chef::ReservedNames::Win32::API::Security::GENERIC_READ", 1)
         stub_const("Chef::ReservedNames::Win32::API::Security::GENERIC_EXECUTE", 4)

data/spec/unit/provider/service/systemd_service_spec.rb

@@ -36,11 +36,11 @@ describe Chef::Provider::Service::Systemd do
   let(:provider) { Chef::Provider::Service::Systemd.new(new_resource, run_context) }
 
   let(:shell_out_success) do
-    double("shell_out", exitstatus: 0, error?: false)
+    double("shell_out", exitstatus: 0, error?: false, stdout: "")
   end
 
   let(:shell_out_failure) do
-    double("shell_out", exitstatus: 1, error?: true)
+    double("shell_out", exitstatus: 1, error?: true, stdout: "")
   end
 
   let(:current_resource) { Chef::Resource::Service.new(service_name) }
@@ -56,6 +56,7 @@ describe Chef::Provider::Service::Systemd do
       allow(provider).to receive(:is_active?).and_return(false)
       allow(provider).to receive(:is_enabled?).and_return(false)
       allow(provider).to receive(:is_masked?).and_return(false)
+      allow(provider).to receive(:is_indirect?).and_return(false)
     end
 
     it "should create a current resource with the name of the new resource" do
@@ -359,6 +360,29 @@ describe Chef::Provider::Service::Systemd do
           expect(provider.is_masked?).to be false
         end
       end
+
+      describe "is_indirect?" do
+        before(:each) do
+          provider.current_resource = current_resource
+          current_resource.service_name(service_name)
+          allow(provider).to receive(:which).with("systemctl").and_return(systemctl_path.to_s)
+        end
+
+        it "should return true if '#{systemctl_path} --system is-enabled service_name' returns 'indirect'" do
+          expect(provider).to receive(:shell_out).with("#{systemctl_path} --system is-enabled #{service_name_escaped}", {}).and_return(double(stdout: "indirect", exitstatus: shell_out_success))
+          expect(provider.is_indirect?).to be true
+        end
+
+        it "should return false if '#{systemctl_path} --system is-enabled service_name' returns 0 and outputs something other than 'indirect'" do
+          expect(provider).to receive(:shell_out).with("#{systemctl_path} --system is-enabled #{service_name_escaped}", {}).and_return(double(stdout: "enabled", exitstatus: shell_out_success))
+          expect(provider.is_indirect?).to be false
+        end
+
+        it "should return false if '#{systemctl_path} --system is-enabled service_name' returns anything except 0 and outputs somethign other than 'indirect''" do
+          expect(provider).to receive(:shell_out).with("#{systemctl_path} --system is-enabled #{service_name_escaped}", {}).and_return(double(stdout: "enabled", exitstatus: shell_out_failure))
+          expect(provider.is_indirect?).to be false
+        end
+      end
     end
   end
 end

data/spec/unit/provider/subversion_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -274,7 +274,7 @@ describe Chef::Provider::Subversion do
 
     it "selects 'svn' as the binary by default" do
       @resource.svn_binary nil
-      allow(ChefConfig).to receive(:windows?) { false }
+      allow(ChefUtils).to receive(:windows?) { false }
       expect(@provider).to receive(:svn_binary).and_return("svn")
       expect(@provider.export_command).to eql(
         "svn export --force -q   -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
@@ -283,7 +283,7 @@ describe Chef::Provider::Subversion do
 
     it "selects an svn binary with an exe extension on windows" do
       @resource.svn_binary nil
-      allow(ChefConfig).to receive(:windows?) { true }
+      allow(ChefUtils).to receive(:windows?) { true }
       expect(@provider).to receive(:svn_binary).and_return("svn.exe")
       expect(@provider.export_command).to eql(
         "svn.exe export --force -q   -r12345 http://svn.example.org/trunk/ /my/deploy/dir"

data/spec/unit/provider/systemd_unit_spec.rb

@@ -65,11 +65,19 @@ describe Chef::Provider::SystemdUnit do
   end
 
   let(:shell_out_masked) do
-    double("shell_out", exit_status: 0, error?: false, stdout: "masked")
+    double("shell_out", exitstatus: 0, error?: false, stdout: "masked")
   end
 
   let(:shell_out_static) do
-    double("shell_out", exit_status: 0, error?: false, stdout: "static")
+    double("shell_out", exitstatus: 0, error?: false, stdout: "static")
+  end
+
+  let(:shell_out_disabled) do
+    double("shell_out", exitstatus: 1, error?: true, stdout: "disabled")
+  end
+
+  let(:shell_out_indirect) do
+    double("shell_out", exitstatus: 0, error?: true, stdout: "indirect")
   end
 
   before(:each) do
@@ -859,7 +867,7 @@ describe Chef::Provider::SystemdUnit do
             current_resource.user(user_name)
             expect(provider).to receive(:shell_out_compacted)
               .with(systemctl_path, "--user", "is-enabled", unit_name, user_cmd_opts)
-              .and_return(shell_out_failure)
+              .and_return(shell_out_disabled)
             expect(provider.enabled?).to be false
           end
         end
@@ -875,7 +883,7 @@ describe Chef::Provider::SystemdUnit do
           it "returns false when unit is not enabled" do
             expect(provider).to receive(:shell_out_compacted)
               .with(systemctl_path, "--system", "is-enabled", unit_name)
-              .and_return(shell_out_failure)
+              .and_return(shell_out_disabled)
             expect(provider.enabled?).to be false
           end
         end
@@ -962,6 +970,47 @@ describe Chef::Provider::SystemdUnit do
           end
         end
       end
+
+      describe "#indirect?" do
+        before(:each) do
+          provider.current_resource = current_resource
+          allow(provider).to receive(:which).with("systemctl").and_return(systemctl_path.to_s)
+        end
+
+        context "when a user is specified" do
+          it "returns true when the unit is indirect" do
+            current_resource.user(user_name)
+            expect(provider).to receive(:shell_out_compacted)
+              .with(systemctl_path, "--user", "is-enabled", unit_name, user_cmd_opts)
+              .and_return(shell_out_indirect)
+            expect(provider.indirect?).to be true
+          end
+
+          it "returns false when the unit is not indirect" do
+            current_resource.user(user_name)
+            expect(provider).to receive(:shell_out_compacted)
+              .with(systemctl_path, "--user", "is-enabled", unit_name, user_cmd_opts)
+              .and_return(shell_out_static)
+            expect(provider.indirect?).to be false
+          end
+        end
+
+        context "when no user is specified" do
+          it "returns true when the unit is indirect" do
+            expect(provider).to receive(:shell_out_compacted)
+              .with(systemctl_path, "--system", "is-enabled", unit_name)
+              .and_return(shell_out_indirect)
+            expect(provider.indirect?).to be true
+          end
+
+          it "returns false when the unit is not indirect" do
+            expect(provider).to receive(:shell_out_compacted)
+              .with(systemctl_path, "--system", "is-enabled", unit_name)
+              .and_return(shell_out_static)
+            expect(provider.indirect?).to be false
+          end
+        end
+      end
     end
   end
 end