Permalink
Browse files

Don't raise exception if the test server has already been shut down.

  • Loading branch information...
TobiasRoikjer committed Feb 28, 2014
1 parent f493a47 commit 4cdd8971587b93985e01d77bc407c073ced0b092
Showing with 6 additions and 1 deletion.
  1. +6 −1 ruby-gem/lib/calabash-android/operations.rb
@@ -553,7 +553,12 @@ def start_test_server_in_background(options={})
def shutdown_test_server
begin
- http("/kill")
+ begin
+ http("/kill")
+ rescue HTTPClient::KeepAliveDisconnected
+ # Do not react if the server is not responding
+ end
+
Timeout::timeout(3) do
sleep 0.3 while app_running?
end

0 comments on commit 4cdd897

Please sign in to comment.