From 2517cae8ac1b52c9a5eca1347a63c072a97e2c4c Mon Sep 17 00:00:00 2001 From: Claire McQuin Date: Tue, 8 Sep 2015 14:57:10 -0700 Subject: Rename refresh_mode_disabled? to dsc_refresh_mode_disabled? --- lib/chef/platform/query_helpers.rb | 2 +- lib/chef/provider/dsc_resource.rb | 6 +++--- spec/functional/resource/dsc_resource_spec.rb | 2 +- spec/unit/platform/query_helpers_spec.rb | 6 +++--- spec/unit/provider/dsc_resource_spec.rb | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/chef/platform/query_helpers.rb b/lib/chef/platform/query_helpers.rb index ea86ab227f..2dd33ea190 100644 --- a/lib/chef/platform/query_helpers.rb +++ b/lib/chef/platform/query_helpers.rb @@ -53,7 +53,7 @@ class Chef Gem::Version.new("5.0.10018.0") end - def refresh_mode_disabled?(node) + def dsc_refresh_mode_disabled?(node) require 'chef/util/powershell/cmdlet' cmdlet = Chef::Util::Powershell::Cmdlet.new(node, "Get-DscLocalConfigurationManager", :object) metadata = cmdlet.run!.return_value diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb index 31c6c078f4..65830131ab 100644 --- a/lib/chef/provider/dsc_resource.rb +++ b/lib/chef/provider/dsc_resource.rb @@ -59,7 +59,7 @@ class Chef a.block_action! end requirements.assert(:run) do |a| - a.assertion { refresh_mode_disabled? } + a.assertion { dsc_refresh_mode_disabled? } err = ["The LCM must have its RefreshMode set to Disabled. "] a.failure_message Chef::Exceptions::ProviderNotFound, err.join(' ') a.whyrun err + ["Assuming a previous resource sets the RefreshMode."] @@ -84,8 +84,8 @@ class Chef run_context && Chef::Platform.supports_dsc_invoke_resource?(node) end - def refresh_mode_disabled? - Chef::Platform.refresh_mode_disabled?(node) + def dsc_refresh_mode_disabled? + Chef::Platform.dsc_refresh_mode_disabled?(node) end def generate_description diff --git a/spec/functional/resource/dsc_resource_spec.rb b/spec/functional/resource/dsc_resource_spec.rb index 820e8fe123..24503f1ec7 100644 --- a/spec/functional/resource/dsc_resource_spec.rb +++ b/spec/functional/resource/dsc_resource_spec.rb @@ -43,7 +43,7 @@ describe Chef::Resource::DscResource, :windows_powershell_dsc_only do before do if !Chef::Platform.supports_dsc_invoke_resource?(node) skip 'Requires Powershell >= 5.0.10018.0' - elsif !Chef::Platform.refresh_mode_disabled?(node) + elsif !Chef::Platform.dsc_refresh_mode_disabled?(node) skip 'Requires LCM RefreshMode is Disabled' end end diff --git a/spec/unit/platform/query_helpers_spec.rb b/spec/unit/platform/query_helpers_spec.rb index 78f90748d3..f33bfa128b 100644 --- a/spec/unit/platform/query_helpers_spec.rb +++ b/spec/unit/platform/query_helpers_spec.rb @@ -75,7 +75,7 @@ describe 'Chef::Platform#supports_dsc_invoke_resource?' do end end -describe 'Chef::Platform#refresh_mode_disabled?' do +describe 'Chef::Platform#dsc_refresh_mode_disabled?' do let(:node) { instance_double('Chef::Node') } let(:cmdlet) { instance_double('Chef::Util::Powershell::Cmdlet') } let(:cmdlet_result) { instance_double('Chef::Util::Powershell::CmdletResult')} @@ -86,7 +86,7 @@ describe 'Chef::Platform#refresh_mode_disabled?' do and_return(cmdlet) expect(cmdlet).to receive(:run!).and_return(cmdlet_result) expect(cmdlet_result).to receive(:return_value).and_return({ 'RefreshMode' => 'Disabled' }) - expect(Chef::Platform.refresh_mode_disabled?(node)).to be true + expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be true end it "returns false when RefreshMode is not Disabled" do @@ -95,7 +95,7 @@ describe 'Chef::Platform#refresh_mode_disabled?' do and_return(cmdlet) expect(cmdlet).to receive(:run!).and_return(cmdlet_result) expect(cmdlet_result).to receive(:return_value).and_return({ 'RefreshMode' => 'LaLaLa' }) - expect(Chef::Platform.refresh_mode_disabled?(node)).to be false + expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be false end end diff --git a/spec/unit/provider/dsc_resource_spec.rb b/spec/unit/provider/dsc_resource_spec.rb index 807a844346..9946ab8410 100644 --- a/spec/unit/provider/dsc_resource_spec.rb +++ b/spec/unit/provider/dsc_resource_spec.rb @@ -51,7 +51,7 @@ describe Chef::Provider::DscResource do context 'when RefreshMode is not set to Disabled' do it 'raises an exception' do - expect(provider).to receive(:refresh_mode_disabled?).and_return(false) + expect(provider).to receive(:dsc_refresh_mode_disabled?).and_return(false) expect { provider.run_action(:run) }.to raise_error( Chef::Exceptions::ProviderNotFound, /Disabled/) end @@ -59,14 +59,14 @@ describe Chef::Provider::DscResource do context 'when RefreshMode is set to Disabled' do it 'does not update the resource if it is up to date' do - expect(provider).to receive(:refresh_mode_disabled?).and_return(true) + expect(provider).to receive(:dsc_refresh_mode_disabled?).and_return(true) expect(provider).to receive(:test_resource).and_return(true) provider.run_action(:run) expect(resource).not_to be_updated end it 'converges the resource if it is not up to date' do - expect(provider).to receive(:refresh_mode_disabled?).and_return(true) + expect(provider).to receive(:dsc_refresh_mode_disabled?).and_return(true) expect(provider).to receive(:test_resource).and_return(false) expect(provider).to receive(:set_resource) provider.run_action(:run) -- cgit v1.2.1