Ticket #346: 346-part2.patch

File 346-part2.patch, 1.8 kB (added by nhemingway, 4 months ago)

Fix for #346 (part 2)

  • a/buildbot/steps/shell.py

    old new  
    427427 
    428428            del lines[0:test_summary_report_index + 2] 
    429429 
    430             re_test_result = re.compile("^Result: (PASS|FAIL)$|Tests: (\d+) Failed: (\d+)\)") 
     430            re_test_result = re.compile("^Result: (PASS|FAIL)$|Tests: \d+ Failed: (\d+)\)|Files=\d+, Tests=(\d+)") 
    431431 
    432432            mos = map(lambda line: re_test_result.search(line), lines) 
    433433            test_result_lines = [mo.groups() for mo in mos if mo] 
    …… 
    437437                    rc = SUCCESS 
    438438                elif line[0] == 'FAIL': 
    439439                    rc = FAILURE 
    440                 else: 
    441                     total += int(line[1]) 
    442                     failed += int(line[2]) 
     440                elif line[1]: 
     441                    failed += int(line[1]) 
     442                elif line[2]: 
     443                    total = int(line[2]) 
    443444 
    444445        except ValueError: # Nope, it's the old version 
    445446            re_test_result = re.compile("^(All tests successful)|(\d+)/(\d+) subtests failed|Files=\d+, Tests=(\d+),") 

  • a/buildbot/test/test_steps.py

    old new  
    742742        self.failUnlessEqual(rc, FAILURE) 
    743743        ss = step.step_status 
    744744        self.failUnlessEqual(ss.getStatistic('tests-failed'), 287) 
    745         self.failUnlessEqual(ss.getStatistic('tests-total'), 39982) 
    746         self.failUnlessEqual(ss.getStatistic('tests-passed'), 39695) 
     745        self.failUnlessEqual(ss.getStatistic('tests-total'), 264809) 
     746        self.failUnlessEqual(ss.getStatistic('tests-passed'), 264522)