kill osrm-routed if it refuses to shutdown in cuke tests

features/support/launch.rb

@@ -1,14 +1,24 @@
 require 'socket'
 require 'sys/proctable'
 
-LAUNCH_TIMEOUT = 5
-SHUTDOWN_TIMEOUT = 5
+LAUNCH_TIMEOUT = 2
+SHUTDOWN_TIMEOUT = 2
 
 class OSRMLauncher
   def initialize &block
     Dir.chdir TEST_FOLDER do
       begin
-        begin
+        launch
+        yield
+      ensure
+        shutdown
+      end
+    end
+  end
+
+  private
+  
+  def launch
     Timeout.timeout(LAUNCH_TIMEOUT) do
       osrm_up
       wait_for_connection
@@ -16,19 +26,16 @@ class OSRMLauncher
   rescue Timeout::Error
     raise "*** Launching osrm-routed timed out."
   end
-        yield
-      ensure
-        begin
+  
+  def shutdown
     Timeout.timeout(SHUTDOWN_TIMEOUT) do
       osrm_down
     end
   rescue Timeout::Error
+    kill
     raise "*** Shutting down osrm-routed timed out."
   end
-      end
-    end
-  end
-end
+  
   
   def osrm_up?
     if @pipe
@@ -55,7 +62,6 @@ def osrm_down
     if @pipe
       Process.kill 'TERM', @pipe.pid
       wait_for_shutdown
-    @pipe = nil
     end
   end
 
@@ -81,3 +87,4 @@ def wait_for_shutdown
       sleep 0.1
     end
   end
+end