diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-20 10:39:47 -0700 |
---|---|---|
committer | Bryan McLellan <btm@loftninjas.org> | 2014-08-29 07:58:43 -0400 |
commit | 70bf394d094fbc30f8e8ffe79574c11d2508d585 (patch) | |
tree | c96e1f7b4fb6d5d4bafdd8a9e7f58939db4ab399 /spec | |
parent | 49f9e2a45dfe449ccff3bc013d19b59d31d5ee97 (diff) | |
download | chef-70bf394d094fbc30f8e8ffe79574c11d2508d585.tar.gz |
refactoring freebsd provider + unit tests
Diffstat (limited to 'spec')
-rw-r--r-- | spec/unit/provider/service/freebsd_service_spec.rb | 541 | ||||
-rw-r--r-- | spec/unit/provider/service/simple_service_spec.rb | 2 |
2 files changed, 352 insertions, 191 deletions
diff --git a/spec/unit/provider/service/freebsd_service_spec.rb b/spec/unit/provider/service/freebsd_service_spec.rb index cfdfbeb85a..4339adfe04 100644 --- a/spec/unit/provider/service/freebsd_service_spec.rb +++ b/spec/unit/provider/service/freebsd_service_spec.rb @@ -18,8 +18,13 @@ require 'spec_helper' -describe Chef::Provider::Service::Freebsd do +class Chef::Provider::Service::Freebsd + public :service_enable_variable_name + public :determine_enabled_status! + public :determine_current_status! +end +describe Chef::Provider::Service::Freebsd do let(:node) do node = Chef::Node.new node.automatic_attrs[:command] = {:ps => "ps -ax"} @@ -46,310 +51,468 @@ describe Chef::Provider::Service::Freebsd do provider end - # ununsed? - # let(:init_command) { "/usr/local/etc/rc.d/apache22" } - before do allow(Chef::Resource::Service).to receive(:new).and_return(current_resource) end - describe "load_current_resource" do - let(:stdout) do - StringIO.new(<<-PS_SAMPLE) -413 ?? Ss 0:02.51 /usr/sbin/syslogd -s -539 ?? Is 0:00.14 /usr/sbin/sshd -545 ?? Ss 0:17.53 sendmail: accepting connections (sendmail) -PS_SAMPLE - end + def stub_etc_rcd_script + allow(::File).to receive(:exist?).and_return(false) + expect(::File).to receive(:exist?).with("/etc/rc.d/#{new_resource.service_name}").and_return(true) + end - let(:status) { double(:stdout => stdout, :exitstatus => 0) } + def stub_usr_local_rcd_script + allow(::File).to receive(:exist?).and_return(false) + expect(::File).to receive(:exist?).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_return(true) + end - before(:each) do - allow(provider).to receive(:shell_out!).with(node[:command][:ps]).and_return(status) + def run_load_current_resource + stub_usr_local_rcd_script + provider.load_current_resource + end - allow(::File).to receive(:exists?).and_return(false) - allow(::File).to receive(:exists?).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_return(true) - lines = double("lines") - allow(lines).to receive(:each).and_yield("sshd_enable=\"YES\""). - and_yield("#{new_resource.name}_enable=\"YES\"") - allow(::File).to receive(:open).and_return(lines) + describe Chef::Provider::Service::Freebsd, "initialize" do + it "should default enabled_state_found to false" do + expect(provider.enabled_state_found).to be false + end - rc_with_name = StringIO.new(<<-RC_SAMPLE) -name="apache22" -rcvar=`set_rcvar` -RC_SAMPLE - allow(::File).to receive(:open).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_return(rc_with_name) - allow(provider).to receive(:service_enable_variable_name).and_return nil + it "should find /usr/local/etc/rc.d init scripts" do + stub_usr_local_rcd_script + expect(provider.init_command).to eql "/usr/local/etc/rc.d/apache22" end - it "should create a current resource with the name of the new resource" do - expect(Chef::Resource::Service).to receive(:new).and_return(current_resource) - provider.load_current_resource + it "should find /etc/rc.d init scripts" do + stub_etc_rcd_script + expect(provider.init_command).to eql "/etc/rc.d/apache22" end - it "should set the current resources service name to the new resources service name" do - provider.load_current_resource - expect(current_resource.service_name).to eq(new_resource.service_name) + it "should set init_command to nil if it can't find anything" do + allow(::File).to receive(:exist?).and_return(false) + expect(provider.init_command).to be nil end + end - it "should not raise an exception if the rcscript have a name variable" do - provider.load_current_resource - expect { provider.service_enable_variable_name }.not_to raise_error + describe Chef::Provider::Service::Freebsd, "determine_current_status!" do + before do + stub_usr_local_rcd_script + provider.current_resource = current_resource + current_resource.service_name(new_resource.service_name) end - describe "when the service supports status" do + context "when a status command has been specified" do + let(:status) { double(:stdout => "", :exitstatus => 0) } + + before do + new_resource.status_command("/bin/chefhasmonkeypants status") + end + + it "should run the services status command if one has been specified" do + expect(provider).to receive(:shell_out).with("/bin/chefhasmonkeypants status").and_return(status) + provider.determine_current_status! + end + end + + context "when the service supports status" do + let(:status) { double(:stdout => "", :exitstatus => 0) } + before do new_resource.supports({:status => true}) end it "should run '/etc/init.d/service_name status'" do - expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{current_resource.service_name} status").and_return(status) - provider.load_current_resource + expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{new_resource.service_name} status").and_return(status) + provider.determine_current_status! end it "should set running to true if the status command returns 0" do - expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{current_resource.service_name} status").and_return(status) - expect(current_resource).to receive(:running).with(true) - provider.load_current_resource + expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{new_resource.service_name} status").and_return(status) + provider.determine_current_status! + expect(current_resource.running).to be true end it "should set running to false if the status command returns anything except 0" do - expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{current_resource.service_name} status").and_raise(Mixlib::ShellOut::ShellCommandFailed) - expect(current_resource).to receive(:running).with(false) - provider.load_current_resource - # provider.current_resource.running.should be_false + expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{new_resource.service_name} status").and_raise(Mixlib::ShellOut::ShellCommandFailed) + provider.determine_current_status! + expect(current_resource.running).to be false end end - describe "when a status command has been specified" do + context "when we have a 'ps' attribute" do + let(:stdout) do + StringIO.new(<<-PS_SAMPLE) +413 ?? Ss 0:02.51 /usr/sbin/syslogd -s +539 ?? Is 0:00.14 /usr/sbin/sshd +545 ?? Ss 0:17.53 sendmail: accepting connections (sendmail) +PS_SAMPLE + end + let(:status) { double(:stdout => stdout, :exitstatus => 0) } + before do - new_resource.status_command("/bin/chefhasmonkeypants status") + node.automatic_attrs[:command] = {:ps => "ps -ax"} end - it "should run the services status command if one has been specified" do - expect(provider).to receive(:shell_out).with("/bin/chefhasmonkeypants status").and_return(status) - provider.load_current_resource + it "should shell_out! the node's ps command" do + expect(provider).to receive(:shell_out!).with(node[:command][:ps]).and_return(status) + provider.determine_current_status! + end + + it "should read stdout of the ps command" do + allow(provider).to receive(:shell_out!).and_return(status) + expect(stdout).to receive(:each_line).and_return(true) + provider.determine_current_status! + end + + context "when the regex matches the output" do + let(:stdout) do + StringIO.new(<<-PS_SAMPLE) +555 ?? Ss 0:05.16 /usr/sbin/cron -s + 9881 ?? Ss 0:06.67 /usr/local/sbin/httpd -DNOHTTPACCEPT + PS_SAMPLE + end + + it "should set running to true" do + allow(provider).to receive(:shell_out!).and_return(status) + provider.determine_current_status! + expect(current_resource.running).to be_true + end + end + + it "should set running to false if the regex doesn't match" do + allow(provider).to receive(:shell_out!).and_return(status) + provider.determine_current_status! + expect(current_resource.running).to be_false end + it "should set running to nil if ps fails" do + allow(provider).to receive(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed) + provider.determine_current_status! + expect(current_resource.running).to be_nil + expect(provider.status_load_success).to be_nil + end + + context "when ps command is nil" do + before do + node.automatic_attrs[:command] = {:ps => nil} + end + + it "should set running to nil" do + pending "superclass raises no conversion of nil to string which seems broken" + provider.determine_current_status! + expect(current_resource.running).to be_nil + end + end + + context "when ps is empty string" do + before do + node.automatic_attrs[:command] = {:ps => ""} + end + + it "should set running to nil" do + provider.determine_current_status! + expect(current_resource.running).to be_nil + end + end end + end - it "should raise error if the node has a nil ps attribute and no other means to get status" do - node.automatic_attrs[:command] = {:ps => nil} - provider.define_resource_requirements - expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) + describe Chef::Provider::Service::Freebsd, "determine_enabled_status!" do + before do + stub_usr_local_rcd_script + provider.current_resource = current_resource + current_resource.service_name(new_resource.service_name) + + allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable") end - it "should raise error if the node has an empty ps attribute and no other means to get status" do - node.automatic_attrs[:command] = {:ps => ""} - provider.define_resource_requirements - expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) + context "when /etc/rc.conf does not exist" do + before do + expect(::File).to receive(:exist?).with("/etc/rc.conf").and_return(false) + end + + it "sets enabled to false" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be false + end end - describe "when executing assertions" do - it "should verify that /etc/rc.conf exists" do - expect(::File).to receive(:exists?).with("/etc/rc.conf") - allow(provider).to receive(:service_enable_variable_name).and_return("#{current_resource.service_name}_enable") - provider.load_current_resource + context "when /etc/rc.conf does exist" do + before do + expect(::File).to receive(:exist?).with("/etc/rc.conf").and_return(true) + expect(provider).to receive(:read_rc_conf).and_return(lines) end - context "and the init script is not found" do - [ "start", "reload", "restart", "enable" ].each do |action| - it "should raise an exception when the action is #{action}" do - allow(::File).to receive(:exists?).and_return(false) - provider.load_current_resource - provider.define_resource_requirements - expect(provider.instance_variable_get("@rcd_script_found")).to be_false - provider.action = action - expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) + %w{YES Yes yes yEs YeS}.each do |setting| + context "when the enable variable is set to #{setting}" do + let(:lines) { [ %Q{#{new_resource.service_name}_enable="#{setting}"} ] } + it "sets enabled to true" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be true end end + end - [ "stop", "disable" ].each do |action| - it "should not raise an error when the action is #{action}" do - provider.action = action - expect { provider.process_resource_requirements }.not_to raise_error + %w{No NO no}.each do |setting| + context "when the enable variable is set to #{setting}" do + let(:lines) { [ %Q{#{new_resource.service_name}_enable="#{setting}"} ] } + it "sets enabled to false" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be false end end end - it "update state when current resource enabled state could not be determined" do - expect(::File).to receive(:exists?).with("/etc/rc.conf").and_return false - provider.load_current_resource - expect(provider.instance_variable_get("@enabled_state_found")).to be_false + context "when the enable variable is garbage" do + let(:lines) { [ %Q{#{new_resource.service_name}_enable="alskdjflasdkjflakdfj"} ] } + it "sets enabled to false" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be false + end end - it "update state when current resource enabled state could be determined" do - allow(::File).to receive(:exist?).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_return(true) - expect(::File).to receive(:exists?).with("/etc/rc.conf").and_return true - provider.load_current_resource - expect(provider.instance_variable_get("@enabled_state_found")).to be_false - expect(provider.instance_variable_get("@rcd_script_found")).to be_true - provider.define_resource_requirements - expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service, - "Could not find the service name in /usr/local/etc/rc.d/#{current_resource.service_name} and rcvar") + context "when the enable variable partial matches some other service and we are disabled" do + let(:lines) { [ + %Q{thing_#{new_resource.service_name}_enable="YES"}, + %Q{#{new_resource.service_name}_enable="NO"}, + ] } + it "sets enabled to false" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be false + end end - it "should throw an exception if service line is missing from rc.d script" do - pending "not implemented" do - expect(false).to be_true - end + context "when the enable variable partial matches some other disabled service and we are enabled" do + let(:lines) { [ + %Q{thing_#{new_resource.service_name}_enable="NO"}, + %Q{#{new_resource.service_name}_enable="YES"}, + ] } + it "sets enabled to true" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be true + end + end + + context "when the enable variable only partial matches some other enabled service" do + let(:lines) { [ %Q{thing_#{new_resource.service_name}_enable="YES"} ] } + it "sets enabled to false" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be false + end end + context "when nothing matches" do + let(:lines) { [] } + it "sets enabled to true" do + provider.determine_enabled_status! + expect(current_resource.enabled).to be false + end + end end + end - describe "when we have a 'ps' attribute" do - before do - node.automatic_attrs[:command] = {:ps => "ps -ax"} + describe Chef::Provider::Service::Freebsd, "service_enable_variable_name" do + before do + stub_usr_local_rcd_script + provider.current_resource = current_resource + current_resource.service_name(new_resource.service_name) + + expect(::File).to receive(:open).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_yield(rcscript) + end + + context "when the rc script has a 'name' variable" do + let(:rcscript) do + StringIO.new(<<-EOF) +name="#{new_resource.service_name}" +rcvar=`set_rcvar` +EOF end - it "should shell_out! the node's ps command" do - expect(provider).to receive(:shell_out!).with(node[:command][:ps]).and_return(status) - provider.load_current_resource + it "should not raise an exception if the rcscript have a name variable" do + expect { provider.service_enable_variable_name }.not_to raise_error end - it "should read stdout of the ps command" do - allow(provider).to receive(:shell_out!).and_return(status) - expect(stdout).to receive(:each_line).and_return(true) - provider.load_current_resource + it "should not run rcvar" do + expect(provider).not_to receive(:shell_out!) + provider.service_enable_variable_name end - it "should set running to true if the regex matches the output" do - allow(stdout).to receive(:each_line).and_yield("555 ?? Ss 0:05.16 /usr/sbin/cron -s"). - and_yield(" 9881 ?? Ss 0:06.67 /usr/local/sbin/httpd -DNOHTTPACCEPT") - provider.load_current_resource - expect(current_resource.running).to be_true + it "should return the enable variable determined from the rcscript name" do + expect(provider.service_enable_variable_name).to eql "#{new_resource.service_name}_enable" end + end - it "should set running to false if the regex doesn't match" do - allow(provider).to receive(:shell_out!).and_return(status) - provider.load_current_resource - expect(current_resource.running).to be_false + describe "when the rcscript does not have a name variable" do + let(:rcscript) do + StringIO.new <<-EOF +rcvar=`set_rcvar` +EOF end - it "should raise an exception if ps fails" do - allow(provider).to receive(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed) - provider.load_current_resource - provider.define_resource_requirements - expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) + before do + status = double(:stdout => rcvar_stdout, :exitstatus => 0) + allow(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} rcvar").and_return(status) + end + + describe "when rcvar returns foobar_enable" do + let(:rcvar_stdout) do + rcvar_stdout = <<-EOF +# apache22 +# +# #{new_resource.service_name}_enable="YES" +# (default: "") +EOF + end + + it "should get the service name from rcvar if the rcscript does not have a name variable" do + expect(provider.service_enable_variable_name).to eq("#{new_resource.service_name}_enable") + end + + it "should not raise an exception if the rcscript does not have a name variable" do + expect { provider.service_enable_variable_name }.not_to raise_error + end end + + describe "when rcvar does not return foobar_enable" do + let(:rcvar_stdout) do + rcvar_stdout = <<-EOF +# service_with_noname +# +EOF + end + + it "should return nil" do + expect(provider.service_enable_variable_name).to be nil + end + end + end + end + + describe Chef::Provider::Service::Freebsd, "load_current_resource" do + before(:each) do + stub_usr_local_rcd_script + expect(provider).to receive(:determine_current_status!) + current_resource.running(false) + allow(provider).to receive(:service_enable_variable_name).and_return "#{new_resource.service_name}_enable" + end + + it "should create a current resource with the name of the new resource" do + expect(Chef::Resource::Service).to receive(:new).and_return(current_resource) + provider.load_current_resource + end + + it "should set the current resources service name to the new resources service name" do + provider.load_current_resource + expect(current_resource.service_name).to eq(new_resource.service_name) end it "should return the current resource" do expect(provider.load_current_resource).to eql(current_resource) end - describe "when starting the service" do + end + + context "when testing actions" do + before(:each) do + stub_usr_local_rcd_script + expect(provider).to receive(:determine_current_status!) + current_resource.running(false) + expect(provider).to receive(:determine_enabled_status!) + current_resource.enabled(false) + provider.load_current_resource + end + + describe Chef::Provider::Service::Freebsd, "start_service" do it "should call the start command if one is specified" do new_resource.start_command("/etc/rc.d/chef startyousillysally") expect(provider).to receive(:shell_out!).with("/etc/rc.d/chef startyousillysally") - provider.load_current_resource provider.start_service() end it "should call '/usr/local/etc/rc.d/service_name faststart' if no start command is specified" do expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} faststart") - provider.load_current_resource provider.start_service() end end - describe Chef::Provider::Service::Init, "stop_service" do + describe Chef::Provider::Service::Freebsd, "stop_service" do it "should call the stop command if one is specified" do new_resource.stop_command("/etc/init.d/chef itoldyoutostop") expect(provider).to receive(:shell_out!).with("/etc/init.d/chef itoldyoutostop") - provider.load_current_resource provider.stop_service() end it "should call '/usr/local/etc/rc.d/service_name faststop' if no stop command is specified" do expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} faststop") - provider.load_current_resource provider.stop_service() end end - describe "when restarting a service" do + describe Chef::Provider::Service::Freebsd, "restart_service" do it "should call 'restart' on the service_name if the resource supports it" do new_resource.supports({:restart => true}) expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} fastrestart") - provider.load_current_resource provider.restart_service() end it "should call the restart_command if one has been specified" do new_resource.restart_command("/etc/init.d/chef restartinafire") expect(provider).to receive(:shell_out!).with("/etc/init.d/chef restartinafire") - provider.load_current_resource provider.restart_service() end - end - describe "when the rcscript does not have a name variable" do - before do - rc_with_noname = StringIO.new(<<-RC_SAMPLE) -rcvar=`set_rcvar` -RC_SAMPLE - allow(::File).to receive(:open).with("/usr/local/etc/rc.d/#{current_resource.service_name}").and_return(rc_with_noname) - provider.current_resource = current_resource + it "otherwise it should call stop and start" do + expect(provider).to receive(:stop_service) + expect(provider).to receive(:start_service) + provider.restart_service() end + end + end - describe "when rcvar returns foobar_enable" do - let(:rcvar_stdout) do - rcvar_stdout = <<RCVAR_SAMPLE -# apache22 -# -# #{current_resource.service_name}_enable="YES" -# (default: "") -RCVAR_SAMPLE - end - - before do - status = double(:stdout => rcvar_stdout, :exitstatus => 0) - allow(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{current_resource.service_name} rcvar").and_return(status) - end + describe Chef::Provider::Service::Freebsd, "define_resource_requirements" do + before do + provider.current_resource = current_resource + end - it "should get the service name from rcvar if the rcscript does not have a name variable" do - provider.load_current_resource - allow(provider).to receive(:service_enable_variable_name).and_call_original - expect(provider.service_enable_variable_name).to eq("#{current_resource.service_name}_enable") - end + context "when the init script is not found" do + before do + provider.init_command = nil + allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable") + end - it "should not raise an exception if the rcscript does not have a name variable" do - provider.load_current_resource - expect { provider.service_enable_variable_name }.not_to raise_error + [ "start", "reload", "restart", "enable" ].each do |action| + it "should raise an exception when the action is #{action}" do + provider.define_resource_requirements + provider.action = action + expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) end end - describe "when rcvar does not return foobar_enable" do - let(:rcvar_stdout) do - rcvar_stdout = <<RCVAR_SAMPLE -# service_with_noname -# -RCVAR_SAMPLE + [ "stop", "disable" ].each do |action| + it "should not raise an error when the action is #{action}" do + provider.define_resource_requirements + provider.action = action + expect { provider.process_resource_requirements }.not_to raise_error end + end + end - before do - status = double(:stdout => rcvar_stdout, :exitstatus => 0) - allow(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{current_resource.service_name} rcvar").and_return(status) - end + context "when the init script is found, but the service_enable_variable_name is nil" do + before do + provider.init_command = nil + allow(provider).to receive(:service_enable_variable_name).and_return(nil) + end - [ "start", "reload", "restart", "enable" ].each do |action| - it "should raise an exception when the action is #{action}" do - provider.action = action - provider.load_current_resource - provider.define_resource_requirements - expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) - end + [ "start", "reload", "restart", "enable" ].each do |action| + it "should raise an exception when the action is #{action}" do + provider.action = action + provider.define_resource_requirements + expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service) end + end - [ "stop", "disable" ].each do |action| - it "should not raise an error when the action is #{action}" do - allow(::File).to receive(:exist?).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_return(true) - provider.action = action - provider.load_current_resource - provider.define_resource_requirements - expect { provider.process_resource_requirements }.not_to raise_error - end + [ "stop", "disable" ].each do |action| + it "should not raise an error when the action is #{action}" do + provider.action = action + provider.define_resource_requirements + expect { provider.process_resource_requirements }.not_to raise_error end end end @@ -358,20 +521,20 @@ RCVAR_SAMPLE describe Chef::Provider::Service::Freebsd, "enable_service" do before do provider.current_resource = current_resource - allow(provider).to receive(:service_enable_variable_name).and_return("#{current_resource.service_name}_enable") + allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable") end it "should enable the service if it is not enabled" do allow(current_resource).to receive(:enabled).and_return(false) - expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{current_resource.service_name}_enable=\"NO\"", "bar" ]) - expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{current_resource.service_name}_enable=\"YES\""]) + expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{new_resource.service_name}_enable=\"NO\"", "bar" ]) + expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""]) provider.enable_service() end it "should enable the service if it is not enabled and not already specified in the rc.conf file" do allow(current_resource).to receive(:enabled).and_return(false) expect(provider).to receive(:read_rc_conf).and_return([ "foo", "bar" ]) - expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{current_resource.service_name}_enable=\"YES\""]) + expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""]) provider.enable_service() end @@ -385,13 +548,13 @@ RCVAR_SAMPLE describe Chef::Provider::Service::Freebsd, "disable_service" do before do provider.current_resource = current_resource - allow(provider).to receive(:service_enable_variable_name).and_return("#{current_resource.service_name}_enable") + allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable") end it "should should disable the service if it is not disabled" do allow(current_resource).to receive(:enabled).and_return(true) - expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{current_resource.service_name}_enable=\"YES\"", "bar" ]) - expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{current_resource.service_name}_enable=\"NO\""]) + expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{new_resource.service_name}_enable=\"YES\"", "bar" ]) + expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"NO\""]) provider.disable_service() end diff --git a/spec/unit/provider/service/simple_service_spec.rb b/spec/unit/provider/service/simple_service_spec.rb index 1d94534320..61fb30fe13 100644 --- a/spec/unit/provider/service/simple_service_spec.rb +++ b/spec/unit/provider/service/simple_service_spec.rb @@ -104,8 +104,6 @@ NOMOCKINGSTRINGSPLZ @provider.load_current_resource.should eql(@current_resource) end - - describe "when starting the service" do it "should call the start command if one is specified" do @new_resource.stub(:start_command).and_return("#{@new_resource.start_command}") |