addressed each of the comments

3 files changed, 5 insertions, 20 deletions

diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb
index 1c6952bb81..82c66c3199 100644
--- a/lib/chef/provider/service/macosx.rb
+++ b/lib/chef/provider/service/macosx.rb
@@ -48,16 +48,16 @@ class Chef
           @current_resource.service_name(@new_resource.service_name)
           @plist_size = 0
           @plist = @new_resource.plist ? @new_resource.plist : find_service_plist
-          Chef::Log.debug("Plist: '#{@plist}'")
+          Chef::Log.debug("#{new_resource} Plist: '#{@plist}'")
           @service_label = find_service_label
-          Chef::Log.debug("Service_Label: '#{@service_label}'")
+          Chef::Log.debug("#{new_resource} service_label: '#{@service_label}'")
           # LauchAgents should be loaded as the console user.
           @console_user = @plist ? @plist.include?('LaunchAgents') : false
           @session_type = @new_resource.session_type
 
           if @console_user
             @console_user = Etc.getlogin
-            Chef::Log.debug("Console User: '#{@console_user}'")
+            Chef::Log.debug("#{new_resource} console_user: '#{@console_user}'")
             cmd = "su "
             param = !node['platform_version'].include?('10.10') ? '-l ' : ''
             @base_user_cmd = cmd + param + "#{@console_user} -c"
diff --git a/lib/chef/resource/macosx_service.rb b/lib/chef/resource/macosx_service.rb
index 7b040f2c01..be58dc6676 100644
--- a/lib/chef/resource/macosx_service.rb
+++ b/lib/chef/resource/macosx_service.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Mike Dodge (<mikedodge04@gmail.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright (c) 2015 Facebook, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,6 +39,7 @@ class Chef
       # This will enable user to pass a plist in the case
       # that the filename and label for the service dont match
       def plist(arg=nil)
+        assert_path_exists(arg) unless arg.nil?
         set_or_return(
           :plist,
           arg,
diff --git a/spec/unit/provider/service/macosx_spec.rb b/spec/unit/provider/service/macosx_spec.rb
index 9607ac23ed..4337ee2cee 100644
--- a/spec/unit/provider/service/macosx_spec.rb
+++ b/spec/unit/provider/service/macosx_spec.rb
@@ -159,22 +159,6 @@ SVC_LIST
               end
 
               describe "running unsupported actions" do
-                let(:launchctl_stdout) { StringIO.new <<-SVC_LIST }
-{
-  "LimitLoadToSessionType" = "System";
-  "Label" = "io.redis.redis-server";
-  "TimeOut" = 30;
-  "OnDemand" = false;
-  "LastExitStatus" = 0;
-  "PID" = 62803;
-  "Program" = "do_some.sh";
-  "ProgramArguments" = (
-    "path/to/do_something.sh";
-    "-f";
-  );
-};
-SVC_LIST
-
                 before do
                   allow(Dir).to receive(:glob).and_return(["#{plist}"], [])
                 end