summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2012-08-30 13:54:40 -0700
committerBryan McLellan <btm@opscode.com>2012-08-30 13:54:40 -0700
commit1e60c060cc88380b57db01cf94b5009b40c5cac5 (patch)
tree8a36eb52e5fa550181878858a905d2ba99ef2499
parent89903967b15f7de544eda70988d4b611614075c7 (diff)
downloadchef-1e60c060cc88380b57db01cf94b5009b40c5cac5.tar.gz
CHEF-3380: Tweak FreeBSD tests to work with parent class
The simple init providers assertations are included via super so we have to account for the call to ::File.exist? there.
-rw-r--r--chef/spec/unit/provider/service/freebsd_service_spec.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/chef/spec/unit/provider/service/freebsd_service_spec.rb b/chef/spec/unit/provider/service/freebsd_service_spec.rb
index 36a8b506d0..c1f5ab24cb 100644
--- a/chef/spec/unit/provider/service/freebsd_service_spec.rb
+++ b/chef/spec/unit/provider/service/freebsd_service_spec.rb
@@ -33,6 +33,7 @@ describe Chef::Provider::Service::Freebsd do
@provider = Chef::Provider::Service::Freebsd.new(@new_resource,@run_context)
@provider.action = :start
+ @init_command = "/usr/local/etc/rc.d/apache22"
Chef::Resource::Service.stub!(:new).and_return(@current_resource)
end
@@ -133,15 +134,12 @@ RC_SAMPLE
end
context "and the init script is not found" do
- before do
- ::File.stub!(:exists?).and_return(false)
- @provider.load_current_resource
- @provider.define_resource_requirements
- @provider.instance_variable_get("@rcd_script_found").should be_false
- end
-
[ "start", "reload", "restart", "enable" ].each do |action|
it "should raise an exception when the action is #{action}" do
+ ::File.stub!(:exists?).and_return(false)
+ @provider.load_current_resource
+ @provider.define_resource_requirements
+ @provider.instance_variable_get("@rcd_script_found").should be_false
@provider.action = action
lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
end
@@ -162,6 +160,7 @@ RC_SAMPLE
end
it "update state when current resource enabled state could be determined" do
+ ::File.stub!(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
::File.should_receive(:exists?).with("/etc/rc.conf").and_return true
@provider.load_current_resource
@provider.instance_variable_get("@enabled_state_found").should be_false
@@ -320,6 +319,7 @@ RCVAR_SAMPLE
[ "stop", "disable" ].each do |action|
it "should not raise an error when the action is #{action}" do
+ ::File.stub!(: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