bugsnag-maze-runner 8.12.0 → 8.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a017d7683954e867a7ce32bf3d1b0a6391a27b86ed8a4dad3861d30e9090499
-  data.tar.gz: 7c0c32bfc1e03fbe59c714ddd6766bf9e0e4bd413c2470b4268b6f5843d73f04
+  metadata.gz: 1c4179797bd1c2f213229a61382af46e4961ed8e1c927752082bef991edb7763
+  data.tar.gz: 3861468539c18e1e1ab53a9937eb6fc5fea67147a5a5016d660189ac95103dab
 SHA512:
-  metadata.gz: 8b7a5be493f590641dbbd23bbe9effd0dac6a5207ee1f66401c1511c92765396df08f2a4016ce640af41c7705dd785b836211fb6f680543f8cbd8a5676678f95
-  data.tar.gz: 841b495ddff85d3047afffa356730136f80873a13f7bf0fdb777983eb6fca93a3acb0c5bf5c37287c6382b16234299bef2e7c535628064ae337a847a651896f3
+  metadata.gz: f92c80ce71906d9b16ca07b70a8e2637beb6643e864851667fbca53d28cd464663850480b381c89f31b5afc79928125a6362cc69c227889239771d3938a1582a
+  data.tar.gz: 9641dba3a1675bf5d6afdad3fd7244db7bba1e73e4d3cba91ed0a146f886fe8ead9278b8874b53f194ec73701f508f13b5a0ad1028225c818bc1c5da225ce7a2

data/bin/download-logs

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Workaround for running on ARM macOS machines
+require 'em/pure_ruby'
+
 require_relative '../lib/maze'
 require_relative '../lib/maze/client/bs_client_utils'
 require_relative '../lib/maze/logger'

data/bin/maze-runner

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Workaround for running on ARM macOS machines
+require 'em/pure_ruby'
+
 require 'cucumber/cli/main'
 
 require_relative '../lib/utils/deep_merge'

data/bin/purge-projects

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Workaround for running on ARM macOS machines
+require 'em/pure_ruby'
+
 require_relative '../lib/maze'
 require_relative '../lib/maze/client/bb_api_client'
 require_relative '../lib/maze/logger'

data/bin/upload-app

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Workaround for running on ARM macOS machines
+require 'em/pure_ruby'
+
 require_relative '../lib/maze'
 require_relative '../lib/maze/client/bs_client_utils'
 require_relative '../lib/maze/client/bb_client_utils'

data/lib/maze/api/exit_code.rb

@@ -11,6 +11,7 @@ module Maze
       APP_UPLOAD_FAILURE = 100
       TUNNEL_FAILURE = 101
       SESSION_CREATION_FAILURE = 102
+      APPIUM_SESSION_FAILURE = 103
     end
   end
 end

data/lib/maze/client/appium/bb_devices.rb

@@ -91,46 +91,44 @@ module Maze
           end
 
           def make_android_hash(device)
-            # Doubling up on capabilities in both the `appium:options` and `appium` sub dictionaries.
+            # Tripling up on capabilities in the `appium:options`, `appium` sub dictionaries and base dictionary.
             # See PLAT-11087
+            appium_options = {
+              'automationName' => 'UiAutomator2',
+              'autoGrantPermissions' => true,
+              'uiautomator2ServerInstallTimeout' => 60000
+            }
             hash = {
               'platformName' => 'Android',
               'deviceName' => 'Android Phone',
-              'appium:options' => {
-                'automationName' => 'UiAutomator2',
-                'autoGrantPermissions' => true,
-                'uiautomator2ServerInstallTimeout' => 60000
-              },
-              'appium' => {
-                'automationName' => 'UiAutomator2',
-                'autoGrantPermissions' => true,
-                'uiautomator2ServerInstallTimeout' => 60000
-              },
+              'appium:options' => appium_options,
+              'appium' => appium_options,
               'bitbar:options' => {
                 'device' => device,
               }
             }
+            hash.merge!(appium_options)
             hash.freeze
           end
 
           def make_ios_hash(device)
-            # Doubling up on capabilities in both the `appium:options` and `appium` sub dictionaries.
+            # Tripling up on capabilities in the `appium:options`, `appium` sub dictionaries and base dictionary.
             # See PLAT-11087
-            {
+            appium_options = {
+              'automationName' => 'XCUITest',
+              'shouldTerminateApp' => 'true'
+            }
+            hash = {
               'platformName' => 'iOS',
               'deviceName' => 'iPhone device',
-              'appium:options' => {
-                'automationName' => 'XCUITest',
-                'shouldTerminateApp' => 'true'
-              },
-              'appium' => {
-                'automationName' => 'XCUITest',
-                'shouldTerminateApp' => 'true'
-              },
+              'appium:options' => appium_options,
+              'appium' => appium_options,
               'bitbar:options' => {
                 'device' => device
               }
-            }.freeze
+            }
+            hash.merge!(appium_options)
+            hash.freeze
           end
         end
       end

data/lib/maze/client/bb_client_utils.rb

@@ -19,41 +19,61 @@ module Maze
         # @param api_key [String] The BitBar API key
         # @param app [String] A path to the application file
         # @param app_id_file [String] the file to write the uploaded app url to BitBar
-        def upload_app(api_key, app, app_id_file=nil)
+        # @param max_attempts [Integer] the maximum number of attempts to upload the app
+        def upload_app(api_key, app, app_id_file=nil, max_attempts=5)
           uuid_regex = /\A[0-9]+\z/
 
           if uuid_regex.match? app
             $logger.info "Using pre-uploaded app with ID #{app}"
             app_uuid = app
           else
-            expanded_app = Maze::Helper.expand_path(app)
-            $logger.info "Uploading app: #{expanded_app}"
+            upload_proc = Proc.new do |app_path|
+              $logger.info "Uploading app: #{app_path}"
 
-            # Upload the app to BitBar
-            uri = URI('https://cloud.bitbar.com/api/me/files')
-            request = Net::HTTP::Post.new(uri)
-            request.basic_auth(api_key, '')
-            request.set_form({ 'file' => File.new(expanded_app, 'rb') }, 'multipart/form-data')
+              # Upload the app to BitBar
+              uri = URI('https://cloud.bitbar.com/api/me/files')
+              request = Net::HTTP::Post.new(uri)
+              request.basic_auth(api_key, '')
+              request.set_form({ 'file' => File.new(app_path, 'rb') }, 'multipart/form-data')
 
-            res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-              http.request(request)
+              Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+                http.request(request)
+              end
             end
 
-            # Pull the UUID from the response
-            begin
-              response = JSON.parse res.body
-              if response.key?('id')
-                app_uuid = response['id'].to_s
-                $logger.info "Uploaded app ID: #{app_uuid}"
-                $logger.info 'You can use this ID to avoid uploading the same app more than once.'
-              else
-                $logger.error "Unexpected response body: #{response}"
-                raise 'App upload failed'
+            expanded_app = Maze::Helper.expand_path(app)
+
+            attempts = 0
+            app_uuid = nil
+            last_error = nil
+            while attempts < max_attempts && app_uuid.nil?
+              attempts += 1
+              begin
+                response = upload_proc.call(expanded_app)
+                body = JSON.parse(response.body)
+                if body.key?('id')
+                  app_uuid = body['id'].to_s
+                  $logger.info "Uploaded app ID: #{app_uuid}"
+                  $logger.info 'You can use this ID to avoid uploading the same app more than once.'
+                else
+                  error_string = "Unexpected response body: #{body}"
+                  $logger.error error_string
+                  last_error = RuntimeError.new(error_string)
+                end
+              rescue JSON::ParserError => error
+                last_error = error
+                Bugsnag.notify error
+                $logger.error "Expected JSON response, received: #{response}"
+              rescue => error
+                last_error = error
+                Bugsnag.notify error
+                $logger.error "Unexpected error uploading app: #{error}"
               end
-            rescue JSON::ParserError => error
-              Bugsnag.notify error
-              $logger.error "Expected JSON response, received: #{res}"
-              raise
+            end
+
+            if app_uuid.nil?
+              $logger.error "App upload to BitBar failed after #{attempts} attempts"
+              raise last_error
             end
           end
 

data/lib/maze/retry_handler.rb

@@ -20,10 +20,16 @@ module Maze
         return false if !Maze.config.enable_retries || retried_previously?(test_case)
 
         if retry_on_driver_error?(event)
-          $logger.warn "Retrying #{test_case.name} due to driver error: #{event.result.exception}"
           if Maze.driver.is_a?(Maze::Driver::Appium)
-            Maze.driver.restart
+            if Maze.config.farm.eql?(:bb)
+              Maze::Hooks::ErrorCodeHook.exit_code = Maze::Api::ExitCode::APPIUM_SESSION_FAILURE
+              return false
+            else
+              $logger.warn "Retrying #{test_case.name} due to appium driver error: #{event.result.exception}"
+              Maze.driver.restart
+            end
           elsif Maze.driver.is_a?(Maze::Driver::Browser)
+            $logger.warn "Retrying #{test_case.name} due to selenium driver error: #{event.result.exception}"
             Maze.driver.refresh
           end
         elsif retry_on_tag?(test_case)

data/lib/maze.rb

@@ -7,7 +7,7 @@ require_relative 'maze/timers'
 # Glues the various parts of MazeRunner together that need to be accessed globally,
 # providing an alternative to the proliferation of global variables or singletons.
 module Maze
-  VERSION = '8.12.0'
+  VERSION = '8.13.0'
 
   class << self
     attr_accessor :check, :driver, :internal_hooks, :mode, :start_time, :dynamic_retry, :public_address,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag-maze-runner
 version: !ruby/object:Gem::Version
-  version: 8.12.0
+  version: 8.13.0
 platform: ruby
 authors:
 - Steve Kirkland
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber