res 1.2.17 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e495d9220fa374e9c75cf6f694ada1608b8f2fbf
-  data.tar.gz: c6011b3ced7ae736c19486c0bd91d606dcf3252f
+  metadata.gz: 5d84c2835ecad3685cf33e38756fc5c788aca5fe
+  data.tar.gz: 90b25f6a7c9911b2c9680ebc87149496fa9c9b1d
 SHA512:
-  metadata.gz: 2c1d96c99304680bc61fbb37185758459963743db25a4d90c43055245eeab8394d0f1adb1c55ba53638c02701e9f3883c68f54cc00d74144b4313ac72c515915
-  data.tar.gz: db38fc0d05955a148f63579a343345db7810ef0faad169951cc6b6ac1ef3d73dd537e0d0ca42fa7bdd3d70749e0d7e5d370dc94523d42efd256a38fa04dd4a8f
+  metadata.gz: 66f7f218e8891dfe47b7943347df6e0fe623ec7afaee1c2e21c6489b2fb472ba56d9eee928b5cf047cbefb8d7211b233ca29079cca83e052f71224a8fcd184d8
+  data.tar.gz: dddc9532fc982374c784cc0cc18f417bae986db4eb6ada0fd41b6a1ab8e1ea59282c7abc90aa0be9ec1054df07095706e1d2eb5e2f4ca445792177f8dd49521a

data/README.md

@@ -92,7 +92,7 @@ require you to sync your test definitions before you submit a run.
 You need to create a project file in the root of your test code, the file 
 should be called .testmine.yaml, and should look like this:
 
-    testmine_url: 'mytestmineinstance.bbc.co.uk'
+    url: 'mytestmineinstance.bbc.co.uk'
     authentication: 'authenticationkey'
     project:   'MyProjectName'
     component: 'Android acceptance'

data/bin/res

@@ -148,13 +148,15 @@ if options.reporter
     when 'testmine'
 
       reporter = Res::Reporters::Testmine.new(
-          :config_file => options.config_file,
-          :url         => options.url,
-          :cert        => options.cert,
-          :cacert      => options.cacert,
-          :target      => options.target,
-          :ssl_verify_mode => options.ssl_verify_mode,
-          :ir          => ir
+          :config_file      => options.config_file,
+          :url              => options.url,
+          :cert             => options.cert,
+          :cacert           => options.cacert,
+          :version          => options.version,
+          :target           => options.target,
+          :hive_job_id      => options.job_id,
+          :ssl_verify_mode  => options.ssl_verify_mode,
+          :ir               => ir
       )
 
       id = reporter.submit_results(ir)

data/lib/res/parsers/android_junit.rb

@@ -18,6 +18,10 @@ module Res
       end
 
       def parse(output)
+        test_complete = false
+        total_tests = 0
+        passed = 0
+        failed = 0
         class_name = []
         result = []
         test = {
@@ -28,41 +32,63 @@ module Res
 
         File.open(output) do |f|
           f.each_line do |line|
+            if !line.match('INSTRUMENTATION_RESULT') && !test_complete
 
-            if line.match('INSTRUMENTATION_STATUS_CODE: (.*)$')
-                case Regexp.last_match[1].strip
-                  when '1'
-                    # Skip if this is just the 'pre-run' test
-                    next
-                  when '0'
-                    test[:status] = 'passed'
-                  when '-2'
-                    test[:status] = 'failed'
-                  else
-                    test[:status] = 'unknown'
-                end
-              result.last[:children] << test
-              test = {
-                type: 'AndroidJUnit::Test',
-                name: 'UNKNOWN',
-                status: 'unknown'
-              }
-            end
+              if line.match('INSTRUMENTATION_STATUS: numtests=(.*)$')
+                 total_tests =  Regexp.last_match[1].to_i
+              end
 
-            if line.include?('class')
-              line = line.gsub('INSTRUMENTATION_STATUS: class=', '').strip
-              unless class_name.include? line
-                class_name.push(line)
-                result << {
-                  type: 'AndroidJUnit::Class',
-                  name: class_name.last,
-                  children: Array.new
+              if line.match('INSTRUMENTATION_STATUS_CODE: (.*)$')
+                  case Regexp.last_match[1].strip
+                    when '1'
+                      # Skip if this is just the 'pre-run' test
+                      next
+                    when '0'
+                      test[:status] = 'passed'
+                      passed += 1
+                    when '-2'
+                      test[:status] = 'failed'
+                    else
+                      test[:status] = 'unknown'
+                  end
+                result.last[:children] << test
+                test = {
+                  type: 'AndroidJUnit::Test',
+                  name: 'UNKNOWN',
+                  status: 'unknown'
                 }
               end
-            elsif line.include?('test=')
-              test[:name] = line.gsub('INSTRUMENTATION_STATUS: test=', '').strip
-            elsif line.include?('Error in ')
-              test[:status] = 'failed'
+
+              if line.include?('class=')
+                line = line.gsub('INSTRUMENTATION_STATUS: class=', '').strip
+                unless class_name.include? line
+                  class_name.push(line)
+                  result << {
+                    type: 'AndroidJUnit::Class',
+                    name: class_name.last,
+                    children: Array.new
+                  }
+                end
+              elsif line.include?('test=')
+                test[:name] = line.gsub('INSTRUMENTATION_STATUS: test=', '').strip
+              elsif line.include?('Error in ')
+                test[:status] = 'failed'
+              end
+
+            else
+
+              if line.match('Tests run: (.*),  Failures: (.*)$')
+                failed = Regexp.last_match[2].to_i
+                if total_tests != (passed + failed)
+                  result << {
+                    type: 'AndroidJUnit::Exception',
+                    name: 'Exception(s): Check in logs for more info',
+                    status: 'UNKNOWN'
+                  }
+                end
+              end
+              test_complete = true
+
             end
           end
         end

data/lib/res/reporters/testmine.rb

@@ -8,8 +8,8 @@ module Res
 
       def initialize(args)
         @url = args[:url]
-        @config = Res::Config.new([:project, :component, :suite, :url],
-                                  :optional => [:hive_job_id, :version, :target, :cert, :cacert, :ssl_verify_mode],
+        @config = Res::Config.new([:project, :component, :suite, :url, :target, :version],
+                                  :optional => [:hive_job_id, :cert, :cacert, :ssl_verify_mode],
                                   :pre_env  => 'TESTMINE_')
         config.process(args)
       end
@@ -44,8 +44,8 @@ module Res
         request = Net::HTTP::Post.new(config.url + "/api/v1/submit")
         request.content_type = 'application/json'
         request.set_form_data({"data" => ir.to_json})
-        @http.request(request)
-
+        response = @http.request(request)
+        response.body
       end
 
     end

data/lib/res/version.rb

@@ -1,3 +1,3 @@
 module Res
-  VERSION = '1.2.17'
+  VERSION = '1.2.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries