xamarin-test-cloud 2.0.0.pre4 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5abd84d95ae2a746e1d70bb479542db758b27af
-  data.tar.gz: eadbec669fdee84204a4ce744dc9685ff5979795
+  metadata.gz: dead16bac1bbcbdb4ed7ff55bc656df5da6f5563
+  data.tar.gz: 8298ea5c4fd1b0dc179a4285a78939ee154e8e0c
 SHA512:
-  metadata.gz: dc8a5c6fab7135a1d7094e2d347068c3c833185df051462c86042a1ffec92129d5a7d2ca8ef1df398fa1f96542c064864dc44ea626c0b5bbc69d94011a299a53
-  data.tar.gz: f5e28ac7df1c1a5dae4a2d7aca10a031d933bf5dc866c9f090ec7161a190f3296143fa1174510db1fa15ad443541569fbae9862f3bdce3ddb26b59c6e3c0860d
+  metadata.gz: 622d1602faa1a5f3e1e54b5dae8a6d8165542d659cffbda2d19f441277f1039a536a461449cd9005bd6e72bb52ab85f8616bc1dee4e89d16a8fed095221fa5ee
+  data.tar.gz: 217a4ba762eebdbb7f69d815ce08df678e14646eab8e167a211dd69e2bf4532bd7fc4f73e370e679e34a951d5cda2cd2602ca823084a65967fa0d25379712b7f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ### 2.0.0
 
+* Set :send\_timeout on HTTPClient to allow uploads from flakey internet
+  connections #45
+* Support Calabash 2.0 #43
 * Replace RestClient with HTTPClient
 * Set minimum ruby version to 2.0
 * Gem does not work in Windows environment: ffi cannot be found. #34

data/lib/xamarin-test-cloud/cli.rb

@@ -472,7 +472,7 @@ module XamarinTestCloud
 
         response = http_post(endpoint_path, upload_data) do |response, request|
           if debug?
-            puts "Request url: #{request.url}"
+            puts "Request url: #{self.host}/#{request.route}"
             puts "Response code: #{response.code}"
             puts "Response body: #{response.body}"
           end
@@ -769,7 +769,25 @@ module XamarinTestCloud
 
         if block_given?
           exec_options[:header] = {'Content-Type' => 'multipart/form-data'}
-          exec_options[:timeout] = 90000000
+
+          # How long to wait for the files to upload.
+          exec_options[:send_timeout] = 30 * 60
+
+          # There is some strange behavior here.  The original timeout value
+          # was very large: 90000000.  With a large send_timeout and a modest
+          # receive_timeout, it is possible to get a ReceiveTimeoutError at a
+          # a random time between ~4 and ~20 minutes.  The current working
+          # theory is that the original, very large, timeout is hiding some
+          # unexpected behavior on the server.
+          #
+          # In any event, if send_timeout is exceeeded, the client will raise
+          # a SendTimeoutError so this value can be very large.
+          exec_options[:timeout] = exec_options[:send_timeout] + 10
+
+          # Do not retry.  Files are written to a stream; let the upload
+          # succeed or fail on the first pass.
+          exec_options[:retries] = 1
+
           response = client.post(request, exec_options)
           block.call(response, request)
           response

data/lib/xamarin-test-cloud/http/retriable_client.rb

@@ -48,9 +48,11 @@ module XamarinTestCloud
       # @param [String] endpoint The server to make the HTTP request
       #  on.
       # @param [Hash] options Control the retry, timeout, and interval.
-      # @option options [Number] :retries (5) How often to retry.
-      # @option options [Number] :timeout (5) How long to wait for a response
-      #  before timing out.
+      # @option options [Number] :retries (3) How often to retry.
+      # @option options [Number] :timeout (15) How long to wait for a response
+      #  before timing out. AKA receive_timeout.
+      # @option options [Number] :send_timeout (120) How long to wait for an
+      #  upload.
       # @option options [Number] :interval (0.5) How long to sleep between
       #  retries.
       def initialize(endpoint, options = {})
@@ -59,6 +61,7 @@ module XamarinTestCloud
         @retries = options.fetch(:retries, 3)
         @timeout = options.fetch(:timeout, 15)
         @connect_timeout = options.fetch(:connect_timeout, 15)
+        @send_timeout = options.fetch(:send_timeout, 120)
         @interval = options.fetch(:interval, 0.5)
         @on_error = {}
       end
@@ -78,7 +81,9 @@ module XamarinTestCloud
       # @param [Hash] options Control the retry, timeout, and interval.
       # @option options [Number] :retries (5) How often to retry.
       # @option options [Number] :timeout (5) How long to wait for a response
-      #  before timing out.
+      #  before timing out. AKA receive_timeout.
+      # @option options [Number] :send_timeout (120) How long to wait for an
+      #  upload.
       # @option options [Number] :interval (0.5) How long to sleep between
       #  retries.
       def get(request, options={})
@@ -95,9 +100,11 @@ module XamarinTestCloud
       # @param [Hash] options Control the retry, timeout, and interval.
       # @option options [Number] :retries (3) How many times to retry.
       # @option options [Number] :timeout (15) How long to wait for a response
-      #  before timing out.
+      #  before timing out. AKA receive_timeout.
       # @option options [Number] :connect_timeout (15) How long to wait for a
-      # connection.
+      #  connection.
+      # @option options [Number] :send_timeout (120) How long to wait for an
+      #  upload.
       # @option options [Number] :interval (0.5) How long to sleep between
       #  retries.
       def post(request, options={})
@@ -110,6 +117,7 @@ module XamarinTestCloud
         retries = options.fetch(:retries, @retries)
         timeout = options.fetch(:timeout, @timeout)
         connect_timeout = options.fetch(:timeout, @connect_timeout)
+        send_timeout = options.fetch(:send_timeout, @send_timeout)
         interval = options.fetch(:interval, @interval)
         header = options.fetch(:header, HEADER)
 
@@ -119,6 +127,7 @@ module XamarinTestCloud
         client = @client.dup
         client.receive_timeout = timeout
         client.connect_timeout = connect_timeout
+        client.send_timeout = send_timeout
 
         if options.fetch(:user, nil) && options.fetch(:password, nil)
           client.set_auth(options.fetch(:user), options.fetch(:password))
@@ -129,15 +138,12 @@ module XamarinTestCloud
 
           # Subtract the aggregate time we've spent thus far to make sure we're
           # not exceeding the request timeout across retries.
-          time_diff = start_time + timeout - Time.now
-
+          time_diff = start_time + timeout + send_timeout - Time.now
 
           if time_diff <= 0
-            raise HTTP::Error, 'Timeout exceeded'
+            raise HTTP::Error, "Timeout exceeded"
           end
 
-          client.receive_timeout = [time_diff, client.receive_timeout].min
-
           payload = Payload.generate(request.params)
 
           header.merge!(payload.headers) if payload

data/lib/xamarin-test-cloud/version.rb

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = "2.0.0.pre4"
+  VERSION = "2.0.0.pre5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -197,6 +197,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud