hive-runner 2.1.25 → 2.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7be365592edb7a5230701b8349103112795d0d
-  data.tar.gz: 1b36dab91f7df3b6b5a17d6c0c1b223462c3e852
+  metadata.gz: ad70ec960f421f7fe4345b0e38009b4bdcb9a0e9
+  data.tar.gz: b4b58e12fbd9b3e779c82c8f17e5389253efdd3d
 SHA512:
-  metadata.gz: b94468aba8dba9f4e0db4b316f92c9c4a875ec7db8fba87294ed084936dbcb3deeb30c82c2121ba59890c3fbd95743de0a8903cb3679d2240e1bba8233daac05
-  data.tar.gz: 74099f827f77ed2abdc49c8c5a6eac403e18429aa6c6427cb1344cb18d28b729493ce8a7da1c95e3e512e7ada7497f497ed139789ad1bdf2d58b4e057df6ea07
+  metadata.gz: 85a57f836dfd1ef46bfa80ead6f5bcbf8bffe10adbada4c5f5c9ab556d22ead8ae231f69c8396b0c89cfaaec5ff1fa07ffd6d9cd64a35d1a38d4b752bff4e37f
+  data.tar.gz: 387013f1b155ff46cedf66144dbd3fc70718dba5559ddc8e6a21a5b930b4783a7aea5958d3a752c1f1d37391b53ea27cfa656ec7b83fe1d662a612e486d88071

data/lib/hive/diagnostic.rb

@@ -43,12 +43,12 @@ module Hive
     end
 
     def pass(message= {}, data = {})
-      Hive.logger.info("#{@device_api.serial_no} => #{message} #{data}")
+      Hive.logger.info("#{@device_api.serial} => #{message} #{data}")
       Hive::Results.new("pass", message, data, @hive_mind)
     end
 
     def fail(message ={}, data = {})
-      Hive.logger.info("#{@device_api.serial_no} => #{message} #{data}")
+      Hive.logger.info("#{@device_api.serial} => #{message} #{data}")
       Hive::Results.new("fail", message, data, @hive_mind)
     end
   end

data/lib/hive/worker.rb

@@ -216,6 +216,7 @@ module Hive
       if exception or File.size(@file_system.script_errors_file) > 0
         set_job_state_to :completed
         begin
+          after_error(@job, @file_system, @script)
           upload_files(@job, @file_system.results_path, @file_system.logs_path)
         rescue => e
           @log.error("Exception while uploading files: #{e.backtrace.join("\n  : ")}")
@@ -249,6 +250,7 @@ module Hive
     def diagnostics
       retn = true
       retn = @diagnostic_runner.run if !@diagnostic_runner.nil?
+      @log.info('Diagnostics failed') if not retn
       status = device_status
       status = set_device_status('happy') if status == 'busy'
       raise DeviceNotReady.new("Current device status: '#{status}'") if status != 'happy'
@@ -447,6 +449,10 @@ module Hive
     def pre_script(job, file_system, script)
     end
 
+    # Any tasks to do after a script has terminated with an error
+    def after_error(job, file_system, script)
+    end
+
     # Any device specific steps immediately after the execution script
     def post_script(job, file_system, script)
       signal_safe_post_script(job, file_system, script)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.25
+  version: 2.1.26
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber