Skip to content

Commit

Permalink
Don't raise exception if the test server has already been shut down.
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasRoikjer committed Feb 28, 2014
1 parent f493a47 commit 4cdd897
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion ruby-gem/lib/calabash-android/operations.rb
Expand Up @@ -553,7 +553,12 @@ def start_test_server_in_background(options={})


def shutdown_test_server def shutdown_test_server
begin begin
http("/kill") begin
http("/kill")
rescue HTTPClient::KeepAliveDisconnected
# Do not react if the server is not responding
end

Timeout::timeout(3) do Timeout::timeout(3) do
sleep 0.3 while app_running? sleep 0.3 while app_running?
end end
Expand Down

0 comments on commit 4cdd897

Please sign in to comment.