Fixing issue where a server running in the background cannot be stopped

lib/chef_zero/server.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'net/http'
 require 'openssl'
 require 'puma'
 require 'rubygems'
@@ -125,12 +126,21 @@ def start_background(wait = 5)
     end
 
     def running?
-      !!server.running
+      begin
+        uri = URI(@url)
+        if uri.host == '0.0.0.0' then uri.host = '127.0.0.1' end
+        Net::HTTP.get_response(uri)
+      rescue Errno::ECONNREFUSED
+        false
+      else
+        true
+      end
     end
 
     def stop(wait = 5)
       if @thread
-        @thread.join(wait)
+        server.stop(false)
+        raise unless @thread.join(wait)
       else
         server.stop(true)
       end

spec/server_stops.rb

@@ -0,0 +1,21 @@
+require 'bundler'
+require 'bundler/setup'
+require 'rspec'
+
+require 'chef_zero/server'
+
+describe ChefZero::Server do
+  describe '#stop' do
+    context 'when the server is started in the background' do
+      let(:server) do
+        server = ChefZero::Server.new()
+        server.start_background
+        server
+      end
+      it 'stops' do
+        server.stop
+        expect(server.running?).to eq false
+      end
+    end
+  end
+end