hive-runner-ios 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e19a8402c5a02c35d70ec36a84137ffceceb6e8
-  data.tar.gz: dede2f8bf1a5f183ad032ab1afd4e37761e42225
+  metadata.gz: 192ef9b91c7299cb94c0bc6ef8f4ca1fed554f8f
+  data.tar.gz: 49ecbba9e6f81e5914ee4aff82ac8c5c8fe668f5
 SHA512:
-  metadata.gz: da80b81082e07195e070163cbd0b8e470957c5f570f51cac66e73e3d0f30ea5e9976e5b7fc999d89ee867d5fb4147425138429cabcea47ff7365b07560c53a3e
-  data.tar.gz: a3cf25ee622a2feb3401002c5b989ee13e24aeddd9c0cee7ca3713caaa099caccaa1442d93e38ba1c68b820b5a00b8cb41e925448282172c2ee59b5c065e06e5
+  metadata.gz: '00600598bd71642cb85488f5518af71b2017e2271d78162894f2dfb8ea24df3d13fceed7d43e5ff6fbf126a5c28570943075e1bbc5f5a75e58357c27e31e4dbd'
+  data.tar.gz: 37c47686c6d9b8ade80a889824d066b8802b3d0a44b4e343f1f797d1e8dfc5ad346612d02da07a5af8a640352562136e1f32fbf680cc26d519ab2537fd6b4678

data/lib/hive/diagnostic/ios/uptime.rb

@@ -0,0 +1,69 @@
+require 'hive/diagnostic'
+require 'device_api/ios/idevice'
+
+module Hive
+  class Diagnostic
+    class Ios
+      class Uptime < Diagnostic
+
+        def diagnose(data={})
+          if config.has_key?(:reboot_timeout)
+            if @last_boot_time
+              # DeviceAPI iOS doesn't currently supply uptime.
+              uptime = (Time.now - @last_boot_time).to_i
+              if  uptime < config[:reboot_timeout]
+                data[:next_reboot_in] = {:value => "#{config[:reboot_timeout] - uptime}", :unit => "s"}
+                self.pass("Time for next reboot: #{config[:reboot_timeout] - uptime}s", data)
+              else
+                self.fail("Reboot required", data)
+              end
+            else
+              self.fail('No recorded last boot. Rebooting.', data)
+            end
+          else
+            self.pass("Not configured for reboot", data)
+          end
+        end
+
+        def repair(result)
+          data = {}
+          Hive.logger.debug('[iOS]') { "Rebooting #{self.device_api.serial}" }
+          begin
+            data[:last_rebooted] = {:value => Time.now}
+            self.device_api.reboot
+            sleep 10
+            returned = false
+            60.times do |i|
+              sleep 5
+              Hive.logger.debug('[iOS]') { "Wait for #{self.device_api.serial} (#{i})" }
+              break if (returned = DeviceAPI::IOS::IDevice.devices.keys.include? self.device_api.serial)
+            end
+            # If 'trusted?' is tested too quickly it may(?) break the trust
+            # This can probably be reduced or removed completely
+            sleep 60
+            if returned
+              trusted = false
+              60.times do |i|
+                sleep 5
+                Hive.logger.debug('[iOS]') { "Wait for #{self.device_api.serial} to be trusted (#{i})" }
+                break if (trusted = self.device_api.trusted?)
+              end
+              if trusted
+                self.pass("Rebooted", data)
+              else
+                self.fail("Failed to trust after reboot", data)
+              end
+            else
+              self.fail("Failed to reboot", data)
+            end
+            @last_boot_time = Time.now
+          rescue => e
+            Hive.logger.error('[iOS]') { "Caught exception #{e} while rebooting #{self.device_api.serial}" }
+          end
+          diagnose(data)
+        end
+
+      end
+    end
+  end
+end

data/lib/hive/worker/ios.rb

@@ -1,6 +1,7 @@
 require 'hive/worker'
 require 'hive/messages/ios_job'
 require 'fruity_builder'
+require 'device_api/ios'
 
 module Hive
   class PortReserver
@@ -27,6 +28,8 @@ module Hive
         @device_range = device['device_range'].downcase
         @os_version = device['os_version']
         @worker_ports = PortReserver.new
+        @device_api = DeviceAPI::IOS.device(@serial)
+        device["device_api"] = @device_api
         set_device_status('happy')
         self.device = device
         super(device)
@@ -73,8 +76,7 @@ module Hive
       def pre_script(job, file_system, script)
 
         set_device_status('busy')
-        device = DeviceAPI::IOS.device(self.device['serial'])
-        @installed_apps = device.list_installed_packages
+        @installed_apps = @device_api.list_installed_packages
         @log.debug("Apps installed before test:")
         @installed_apps.each_pair do |app, details|
           @log.debug("  #{app}")
@@ -94,7 +96,7 @@ module Hive
             FruityBuilder::IOS::Signing.sign_app({ cert: @options['signing_identity'], entitlements: entitlements, app: app_path } )
             app_info = FruityBuilder::IOS::Plistutil.get_bundle_id_from_app(app_path)
             app_bundle = app_info['CFBundleIdentifier']
-            device.install(app_path) if job.install_build
+            @device_api.install(app_path) if job.install_build
             script.set_env 'BUNDLE_ID', app_bundle
           end
         else
@@ -125,9 +127,9 @@ module Hive
         script.set_env 'DEVICE_ENDPOINT', "http://#{ip_address}:37265" unless ip_address.nil?
 
         # Required for Appium testing
-        script.set_env 'DEVICE_NAME', device.name
+        script.set_env 'DEVICE_NAME', @device_api.name
         script.set_env 'PLATFORM_NAME', 'iOS'
-        script.set_env 'PLATFORM_VERSION', device.version
+        script.set_env 'PLATFORM_VERSION', @device_api.version
 
         "#{self.device['serial']} #{@worker_ports.ports['Appium']} #{app_path} #{file_system.results_path}"
       end
@@ -142,8 +144,7 @@ module Hive
           @port_allocator.release_port(port)
         end
 
-        device = DeviceAPI::IOS.device(self.device['serial'])
-        @installed_apps_after = device.list_installed_packages
+        @installed_apps_after = @device_api.list_installed_packages
         @log.debug("Apps installed after test:")
         @installed_apps_after.each_pair do |app, details|
           @log.debug("  #{app}")
@@ -153,11 +154,17 @@ module Hive
         end
         (@installed_apps_after.keys - @installed_apps.keys).each do |app|
           @log.info("Uninstalling #{app} (#{@installed_apps_after[app][:package_name]})")
-          device.uninstall(@installed_apps_after[app][:package_name])
+          @device_api.uninstall(@installed_apps_after[app][:package_name])
         end
         set_device_status('happy')
       end
 
+      # Take screenshot when there is an error
+      def after_error(job, file_system, script)
+        @log.info('Taking screenshot after error')
+        @device_api.screenshot(filename: File.expand_path('error.tiff', file_system.results_path))
+      end
+
       #def device_status
       #
       #end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-ios
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hive-runner
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.27
 - !ruby/object:Gem::Dependency
   name: device_api-ios
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: hive-messages
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ files:
 - README.md
 - lib/hive/controller/ios.rb
 - lib/hive/device/ios.rb
+- lib/hive/diagnostic/ios/uptime.rb
 - lib/hive/messages/ios_job.rb
 - lib/hive/worker/ios.rb
 homepage: https://github.com/bbc/hive-runner-ios