Have run_test_cases.py always print test output for failures.

tests/run_test_cases_smoke_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import logging
 import os
 import re
 import shutil
@@ skipping 206 matching lines @@
   def test_simple_fail(self):
     out, err, return_code = RunTest(
         [
           '--jobs', '1',
           '--result', self.filename,
           os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_fail.py'),
         ])
 
     self.assertEqual(1, return_code)
 
-    expected_out_re = [
-      r'\[1/\d\]   \d\.\d\ds .+',
-      r'\[2/\d\]   \d\.\d\ds .+',
-      r'\[3/\d\]   \d\.\d\ds .+',
-      r'\[4/\d\]   \d\.\d\ds .+',
-      # Retries
-      r'\[5/\d\]   \d\.\d\ds .+ retry \#1',
-      r'\[6/\d\]   \d\.\d\ds .+ retry \#2',
+    test_failure_output = [
       re.escape('Note: Google Test filter = Baz.Fail'),
       r'',
     ] + [
       re.escape(l) for l in
       gtest_fake_base.get_test_output('Baz.Fail').splitlines()
     ] + [
       '',
     ] + [
       re.escape(l) for l in gtest_fake_base.get_footer(1, 1).splitlines()
     ] + [
       '',
       '',
+    ]
+
+    expected_out_re = [
+      r'\[1/\d\]   \d\.\d\ds .+',
+      r'\[2/\d\]   \d\.\d\ds .+',
+      r'\[3/\d\]   \d\.\d\ds .+',
+      r'\[4/\d\]   \d\.\d\ds .+',
+    ] + test_failure_output + [
+      # Retries
+      r'\[5/\d\]   \d\.\d\ds .+ retry \#1',
+    ] + test_failure_output + [
+      r'\[6/\d\]   \d\.\d\ds .+ retry \#2',
+    ] + test_failure_output + [
       re.escape('Failed tests:'),
       re.escape('  Baz.Fail'),
       re.escape('Summary:'),
       re.escape('  Success:    3  75.00%') + r' +\d+\.\d\ds',
       re.escape('    Flaky:    0   0.00%') + r' +\d+\.\d\ds',
       re.escape('     Fail:    1  25.00%') + r' +\d+\.\d\ds',
       r'  \d+\.\d\ds Done running 4 tests with 6 executions. \d+\.\d\d test/s',
     ]
     self._check_results(expected_out_re, out, err)
 
@@ skipping 123 matching lines @@
             '--result', self.filename,
             # Make it determinist.
             '--jobs', '1',
             '--retries', '1',
             '--max-failures', '2',
             os.path.join(
               ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_flaky.py'),
             tempdir,
           ])
       self.assertEqual(1, return_code)
       # Give up on checking the stdout.

[M-A Ruel, 2012/12/12 14:30:30]

Ah! I was wondering about test_flaky_something.

It would be good to fix it eventually, I don't know why I didn't check it.

The change you did above is sufficient, no need to change this one because I was
lazy earlier.

       self.assertTrue('STOPPED EARLY' in out, out)
       self.assertEqual('', err)
       # The order is determined by the test shuffling.
       test_cases = [
           ('Foo.Bar1', 1),
           ('Foo.Bar4', 1),
           ('Foo.Bar5', 1),
       ]
       self._check_results_file(
           fail=[u'Foo.Bar1', u'Foo.Bar4', u'Foo.Bar5'],
@@ skipping 16 matching lines @@
     actual_xml = load_xml_as_string_and_filter(self.filename)
     expected_xml = load_xml_as_string_and_filter(
         os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'expected.xml'))
     self.assertEqual(expected_xml, actual_xml)
 
 
 if __name__ == '__main__':
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
   unittest.main()