Merge pull request #53 from figma/eliu/reconcile-logged-spot-failures

Reconcile test results before reporting

Author: eliu-figma

ruby/lib/ci/queue/redis/build_record.rb

@@ -21,6 +21,10 @@ def failed_tests
           redis.hkeys(key('error-reports'))
         end
 
+        def passing_tests
+          redis.lrange(key('list_of_test_names'), 0, -1)
+        end
+
         TOTAL_KEY = "___total___"
         def requeued_tests
           requeues = redis.hgetall(key('requeues-count'))

ruby/lib/minitest/queue/runner.rb

@@ -210,6 +210,8 @@ def report_command
           end
         end
 
+        reconcile_test_results(supervisor.build)
+
         reporter = BuildStatusReporter.new(build: supervisor.build)
 
         if queue_config.failure_file
@@ -241,6 +243,15 @@ def report_command
         exit! reporter.success? && test_time_reporter_success ? 0 : 1
       end
 
+      def reconcile_test_results(build)
+        passing_tests = build.passing_tests
+        build.failed_tests.each do |test_id|
+          if passing_tests.include?(test_id)
+            build.record_success(test_id)
+          end
+        end
+      end
+
       def report_grind_command
         queue_config.build_id = queue_config.build_id + '-grind'
         @queue = CI::Queue::Redis::Grind.new(queue_url, queue_config)