lib/calabash-android/operations.rb in calabash-android-0.4.21 vs lib/calabash-android/operations.rb in calabash-android-0.4.22.pre1

- old
+ new

@@ -552,18 +552,15 @@ end def shutdown_test_server begin - begin - http("/kill") - rescue HTTPClient::KeepAliveDisconnected - # Do not react if the server is not responding - end - + http("/kill") Timeout::timeout(3) do sleep 0.3 while app_running? end + rescue HTTPClient::KeepAliveDisconnected + log ("Server not responding. Moving on.") rescue Timeout::Error log ("Could not kill app. Waited to 3 seconds.") rescue EOFError log ("Could not kill app. App is most likely not running anymore.") end