chef 14.14.29 → 14.15.6

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

@@ -129,14 +129,14 @@ describe Chef::Provider::Service::Gentoo do
     describe Chef::Provider::Service::Gentoo, "enable_service" do
       it "should call rc-update add *service* default" do
         expect(@provider).to receive(:shell_out!).with("/sbin/rc-update add chef default")
-        @provider.enable_service()
+        @provider.enable_service
       end
     end
 
     describe Chef::Provider::Service::Gentoo, "disable_service" do
       it "should call rc-update del *service* default" do
         expect(@provider).to receive(:shell_out!).with("/sbin/rc-update del chef default")
-        @provider.disable_service()
+        @provider.disable_service
       end
     end
   end

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

@@ -36,7 +36,7 @@ describe Chef::Provider::Service::Init, "load_current_resource" do
       aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
       aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
       aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
-PS
+    PS
     @status = double("Status", exitstatus: 0, stdout: @stdout)
     allow(@provider).to receive(:shell_out!).and_return(@status)
   end
@@ -136,7 +136,7 @@ PS
       @stdout = StringIO.new(<<~RUNNING_PS)
         aj        7842  5057  0 21:26 pts/2    00:00:06 chef
         aj        7842  5057  0 21:26 pts/2    00:00:06 poos
-RUNNING_PS
+      RUNNING_PS
       allow(@status).to receive(:stdout).and_return(@stdout)
       @provider.load_current_resource
       expect(@current_resource.running).to be_truthy
@@ -165,12 +165,12 @@ RUNNING_PS
     it "should call the start command if one is specified" do
       @new_resource.start_command("/etc/init.d/chef startyousillysally")
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/chef startyousillysally", default_env: false)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should call '/etc/init.d/service_name start' if no start command is specified" do
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/#{@new_resource.service_name} start", default_env: false)
-      @provider.start_service()
+      @provider.start_service
     end
   end
 
@@ -178,12 +178,12 @@ RUNNING_PS
     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", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
     end
 
     it "should call '/etc/init.d/service_name stop' if no stop command is specified" do
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/#{@new_resource.service_name} stop", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
     end
   end
 
@@ -191,20 +191,20 @@ RUNNING_PS
     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("/etc/init.d/#{@new_resource.service_name} restart", default_env: false)
-      @provider.restart_service()
+      @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/#{@new_resource.service_name} restartinafire", default_env: false)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should just call stop, then start when the resource doesn't support restart and no restart_command is specified" do
       expect(@provider).to receive(:stop_service)
       expect(@provider).to receive(:sleep).with(1)
       expect(@provider).to receive(:start_service)
-      @provider.restart_service()
+      @provider.restart_service
     end
   end
 
@@ -212,13 +212,13 @@ RUNNING_PS
     it "should call 'reload' on the service if it supports it" do
       @new_resource.supports({ reload: true })
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/chef reload", default_env: false)
-      @provider.reload_service()
+      @provider.reload_service
     end
 
     it "should should run the user specified reload command if one is specified and the service doesn't support reload" do
       @new_resource.reload_command("/etc/init.d/chef lollerpants")
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/chef lollerpants", default_env: false)
-      @provider.reload_service()
+      @provider.reload_service
     end
   end
 

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

@@ -36,7 +36,7 @@ describe Chef::Provider::Service::Invokercd, "load_current_resource" do
       aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
       aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
       aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
-PS
+    PS
     @status = double("Status", exitstatus: 0, stdout: @stdout)
     allow(@provider).to receive(:shell_out!).and_return(@status)
   end
@@ -121,7 +121,7 @@ PS
       @stdout = StringIO.new(<<~RUNNING_PS)
         aj        7842  5057  0 21:26 pts/2    00:00:06 chef
         aj        7842  5057  0 21:26 pts/2    00:00:06 poos
-RUNNING_PS
+      RUNNING_PS
       @status = double("Status", exitstatus: 0, stdout: @stdout)
       expect(@provider).to receive(:shell_out!).and_return(@status)
       @provider.load_current_resource
@@ -152,12 +152,12 @@ RUNNING_PS
     it "should call the start command if one is specified" do
       @new_resource.start_command("/usr/sbin/invoke-rc.d chef startyousillysally")
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d chef startyousillysally", default_env: false)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should call '/usr/sbin/invoke-rc.d service_name start' if no start command is specified" do
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d #{@new_resource.service_name} start", default_env: false)
-      @provider.start_service()
+      @provider.start_service
     end
   end
 
@@ -165,12 +165,12 @@ RUNNING_PS
     it "should call the stop command if one is specified" do
       @new_resource.stop_command("/usr/sbin/invoke-rc.d chef itoldyoutostop")
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d chef itoldyoutostop", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
     end
 
     it "should call '/usr/sbin/invoke-rc.d service_name stop' if no stop command is specified" do
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d #{@new_resource.service_name} stop", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
     end
   end
 
@@ -178,20 +178,20 @@ RUNNING_PS
     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/sbin/invoke-rc.d #{@new_resource.service_name} restart", default_env: false)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should call the restart_command if one has been specified" do
       @new_resource.restart_command("/usr/sbin/invoke-rc.d chef restartinafire")
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d #{@new_resource.service_name} restartinafire", default_env: false)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should just call stop, then start when the resource doesn't support restart and no restart_command is specified" do
       expect(@provider).to receive(:stop_service)
       expect(@provider).to receive(:sleep).with(1)
       expect(@provider).to receive(:start_service)
-      @provider.restart_service()
+      @provider.restart_service
     end
   end
 
@@ -199,13 +199,13 @@ RUNNING_PS
     it "should call 'reload' on the service if it supports it" do
       @new_resource.supports({ reload: true })
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d chef reload", default_env: false)
-      @provider.reload_service()
+      @provider.reload_service
     end
 
     it "should should run the user specified reload command if one is specified and the service doesn't support reload" do
       @new_resource.reload_command("/usr/sbin/invoke-rc.d chef lollerpants")
       expect(@provider).to receive(:shell_out!).with("/usr/sbin/invoke-rc.d chef lollerpants", default_env: false)
-      @provider.reload_service()
+      @provider.reload_service
     end
   end
 end

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

@@ -57,7 +57,7 @@ describe Chef::Provider::Service::Macosx do
         <string>io.redis.redis-server</string>
       </dict>
       </plist>
-XML
+    XML
 
     %w{Daemon Agent}.each do |service_type|
       ["redis-server", "io.redis.redis-server"].each do |service_name|
@@ -85,7 +85,7 @@ XML
             allow(provider).to receive(:shell_out)
               .with(/(#{su_cmd} '#{cmd}'|#{cmd})/, default_env: false)
               .and_return(double("Status",
-                                    stdout: launchctl_stdout, exitstatus: 0))
+                stdout: launchctl_stdout, exitstatus: 0))
             allow(File).to receive(:exists?).and_return([true], [])
             allow(provider).to receive(:shell_out!)
               .with(/plutil -convert xml1 -o/, default_env: false)
@@ -150,7 +150,7 @@ XML
                       "-f";
                     );
                   };
-SVC_LIST
+                SVC_LIST
 
                 before do
                   provider.load_current_resource
@@ -188,7 +188,7 @@ SVC_LIST
                       "-f";
                     );
                   };
-SVC_LIST
+                SVC_LIST
 
                 before do
                   provider.load_current_resource
@@ -206,7 +206,7 @@ SVC_LIST
               context "when launchctl doesn't return service entry at all" do
                 let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
                   Could not find service "io.redis.redis-server" in domain for system
-SVC_LIST
+                SVC_LIST
 
                 it "sets service running state to false" do
                   provider.load_current_resource

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

@@ -178,7 +178,8 @@ describe Chef::Provider::Service::Openbsd do
           [
           %Q{thing_#{provider.builtin_service_enable_variable_name}="YES"},
           %Q{#{provider.builtin_service_enable_variable_name}="NO"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (false)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be false
@@ -190,7 +191,8 @@ describe Chef::Provider::Service::Openbsd do
           [
           %Q{#{provider.builtin_service_enable_variable_name}_thing="YES"},
           (provider.builtin_service_enable_variable_name).to_s,
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (false)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be false
@@ -202,7 +204,8 @@ describe Chef::Provider::Service::Openbsd do
           [
           %Q{thing_#{provider.builtin_service_enable_variable_name}="NO"},
           %Q{#{provider.builtin_service_enable_variable_name}="YES"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (true)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be true
@@ -214,7 +217,8 @@ describe Chef::Provider::Service::Openbsd do
           [
           %Q{#{provider.builtin_service_enable_variable_name}_thing="NO"},
           %Q{#{provider.builtin_service_enable_variable_name}="YES"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (true)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be true
@@ -286,12 +290,12 @@ describe Chef::Provider::Service::Openbsd 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", default_env: false)
-        provider.start_service()
+        provider.start_service
       end
 
       it "should call '/usr/local/etc/rc.d/service_name start' if no start command is specified" do
         expect(provider).to receive(:shell_out!).with("/etc/rc.d/#{new_resource.service_name} start", default_env: false)
-        provider.start_service()
+        provider.start_service
       end
     end
 
@@ -299,12 +303,12 @@ describe Chef::Provider::Service::Openbsd 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", default_env: false)
-        provider.stop_service()
+        provider.stop_service
       end
 
       it "should call '/usr/local/etc/rc.d/service_name stop' if no stop command is specified" do
         expect(provider).to receive(:shell_out!).with("/etc/rc.d/#{new_resource.service_name} stop", default_env: false)
-        provider.stop_service()
+        provider.stop_service
       end
     end
 
@@ -313,20 +317,20 @@ describe Chef::Provider::Service::Openbsd do
         let(:supports) { { restart: true } }
         it "should call 'restart' on the service_name if the resource supports it" do
           expect(provider).to receive(:shell_out!).with("/etc/rc.d/#{new_resource.service_name} restart", default_env: false)
-          provider.restart_service()
+          provider.restart_service
         end
       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", default_env: false)
-        provider.restart_service()
+        provider.restart_service
       end
 
       it "otherwise it should call stop and start" do
         expect(provider).to receive(:stop_service)
         expect(provider).to receive(:start_service)
-        provider.restart_service()
+        provider.restart_service
       end
     end
   end

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

@@ -35,7 +35,7 @@ describe Chef::Provider::Service::Simple, "load_current_resource" do
       aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
       aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
       aj        8119  6041  0 21:34 pts/3    00:00:03 vi simple_service_spec.rb
-NOMOCKINGSTRINGSPLZ
+    NOMOCKINGSTRINGSPLZ
     @status = double("Status", exitstatus: 0, stdout: @stdout)
     allow(@provider).to receive(:shell_out!).and_return(@status)
   end
@@ -78,7 +78,7 @@ NOMOCKINGSTRINGSPLZ
       @stdout = StringIO.new(<<~NOMOCKINGSTRINGSPLZ)
         aj        7842  5057  0 21:26 pts/2    00:00:06 chef
         aj        7842  5057  0 21:26 pts/2    00:00:06 poos
-NOMOCKINGSTRINGSPLZ
+      NOMOCKINGSTRINGSPLZ
       @status = double("Status", exitstatus: 0, stdout: @stdout)
       allow(@provider).to receive(:shell_out!).and_return(@status)
       @provider.load_current_resource
@@ -108,7 +108,7 @@ NOMOCKINGSTRINGSPLZ
     it "should call the start command if one is specified" do
       @new_resource.start_command((@new_resource.start_command).to_s)
       expect(@provider).to receive(:shell_out!).with((@new_resource.start_command).to_s, default_env: false)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should raise an exception if no start command is specified" do
@@ -122,7 +122,7 @@ NOMOCKINGSTRINGSPLZ
     it "should call the stop command if one is specified" do
       @new_resource.stop_command("/etc/init.d/themadness stop")
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/themadness stop", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
     end
 
     it "should raise an exception if no stop command is specified" do
@@ -136,7 +136,7 @@ NOMOCKINGSTRINGSPLZ
     it "should call the restart command if one has been specified" do
       @new_resource.restart_command("/etc/init.d/foo restart")
       expect(@provider).to receive(:shell_out!).with("/etc/init.d/foo restart", default_env: false)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should raise an exception if the resource doesn't support restart, no restart command is provided, and no stop command is provided" do
@@ -149,7 +149,7 @@ NOMOCKINGSTRINGSPLZ
       expect(@provider).to receive(:stop_service)
       expect(@provider).to receive(:sleep).with(1)
       expect(@provider).to receive(:start_service)
-      @provider.restart_service()
+      @provider.restart_service
     end
   end
 
@@ -163,7 +163,7 @@ NOMOCKINGSTRINGSPLZ
     it "should should run the user specified reload command if one is specified" do
       @new_resource.reload_command("kill -9 1")
       expect(@provider).to receive(:shell_out!).with("kill -9 1", default_env: false)
-      @provider.reload_service()
+      @provider.reload_service
     end
   end
 end

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

@@ -242,7 +242,7 @@ describe Chef::Provider::Service::Upstart do
       allow(@current_resource).to receive(:enabled).and_return(false)
       expect(@file).to receive(:search_file_replace)
       expect(@file).to receive(:write_file)
-      @provider.enable_service()
+      @provider.enable_service
     end
 
     it "should disable the service if it is enabled" do
@@ -251,7 +251,7 @@ describe Chef::Provider::Service::Upstart do
       allow(@current_resource).to receive(:enabled).and_return(true)
       expect(@file).to receive(:search_file_replace)
       expect(@file).to receive(:write_file)
-      @provider.disable_service()
+      @provider.disable_service
     end
 
   end
@@ -268,19 +268,19 @@ describe Chef::Provider::Service::Upstart do
       @provider.upstart_service_running = false
       @new_resource.start_command("/sbin/rsyslog startyousillysally")
       expect(@provider).to receive(:shell_out!).with("/sbin/rsyslog startyousillysally", default_env: false)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should call '/sbin/start service_name' if no start command is specified" do
       @provider.upstart_service_running = false
       expect(@provider).to receive(:shell_out!).with("/sbin/start #{@new_resource.service_name}", default_env: false).and_return(shell_out_success)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should not call '/sbin/start service_name' if it is already running" do
       @provider.upstart_service_running = true
       expect(@provider).not_to receive(:shell_out!)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should pass parameters to the start command if they are provided" do
@@ -289,14 +289,14 @@ describe Chef::Provider::Service::Upstart do
       @provider = Chef::Provider::Service::Upstart.new(@new_resource, @run_context)
       @provider.current_resource = @current_resource
       expect(@provider).to receive(:shell_out!).with("/sbin/start rsyslog OSD_ID=2", default_env: false).and_return(shell_out_success)
-      @provider.start_service()
+      @provider.start_service
     end
 
     it "should call the restart command if one is specified" do
       allow(@current_resource).to receive(:running).and_return(true)
       @new_resource.restart_command("/sbin/rsyslog restartyousillysally")
       expect(@provider).to receive(:shell_out!).with("/sbin/rsyslog restartyousillysally", default_env: false)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should call start/sleep/stop if no restart command is specified" do
@@ -304,47 +304,47 @@ describe Chef::Provider::Service::Upstart do
       expect(@provider).to receive(:stop_service)
       expect(@provider).to receive(:sleep).with(1)
       expect(@provider).to receive(:start_service)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should call '/sbin/start service_name' if restart_service is called for a stopped service" do
       @provider.upstart_service_running = false
       allow(@current_resource).to receive(:running).and_return(false)
       expect(@provider).to receive(:shell_out!).with("/sbin/start #{@new_resource.service_name}", default_env: false).and_return(shell_out_success)
-      @provider.restart_service()
+      @provider.restart_service
     end
 
     it "should call the reload command if one is specified" do
       allow(@current_resource).to receive(:running).and_return(true)
       @new_resource.reload_command("/sbin/rsyslog reloadyousillysally")
       expect(@provider).to receive(:shell_out!).with("/sbin/rsyslog reloadyousillysally", default_env: false)
-      @provider.reload_service()
+      @provider.reload_service
     end
 
     it "should call '/sbin/reload service_name' if no reload command is specified" do
       allow(@current_resource).to receive(:running).and_return(true)
       expect(@provider).to receive(:shell_out!).with("/sbin/reload #{@new_resource.service_name}", default_env: false).and_return(shell_out_success)
-      @provider.reload_service()
+      @provider.reload_service
     end
 
     it "should call the stop command if one is specified" do
       @provider.upstart_service_running = true
       @new_resource.stop_command("/sbin/rsyslog stopyousillysally")
       expect(@provider).to receive(:shell_out!).with("/sbin/rsyslog stopyousillysally", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
     end
 
     it "should call '/sbin/stop service_name' if no stop command is specified" do
       @provider.upstart_service_running = true
       expect(@provider).to receive(:shell_out!).with("/sbin/stop #{@new_resource.service_name}", default_env: false).and_return(shell_out_success)
-      @provider.stop_service()
+      @provider.stop_service
     end
 
     it "should not call '/sbin/stop service_name' if it is already stopped" do
       @provider.upstart_service_running = false
       allow(@current_resource).to receive(:running).and_return(false)
       expect(@provider).not_to receive(:shell_out!).with("/sbin/stop #{@new_resource.service_name}", default_env: false)
-      @provider.stop_service()
+      @provider.stop_service
       expect(@upstart_service_running).to be_falsey
     end
   end