Merge branch 'kpaulisse-ignore-kill-failures' into kpaulisse-file-compare-environments-production

Author: Kevin Paulisse

spec/octocatalog-diff/support/httparty/ssl_test_server.rb

@@ -30,8 +30,13 @@ def start
 
   def stop
     if @child_pid.is_a?(Fixnum)
-      Process.kill('TERM', @child_pid)
-      Process.wait
+      begin
+        Process.kill('TERM', @child_pid)
+        Process.wait
+      rescue Errno::ESRCH
+        # If we get #<Errno::ESRCH: No such process>, then there is nothing
+        # that needs to be stopped. We don't have to fail the test if this occurs.
+      end
     end
   end