[Findit] Adding central config test class for unit tests

appengine/findit/waterfall/test/extractors_test.py

 # Copyright 2014 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 textwrap
 
-from testing_utils import testing
 from waterfall import extractors
-from waterfall import waterfall_config
 from waterfall.extractor import Extractor
+from waterfall.test import wf_configured_test_case
 
 
-class ExtractorsTest(testing.AppengineTestCase):
+class ExtractorsTest(wf_configured_test_case.WaterfallConfiguredTestCase):
+
+  def setUp(self):
+    super(ExtractorsTest, self).setUp()

[stgao, 2016/03/31 18:07:13]

Is this really needed?

[lijeffrey, 2016/03/31 22:50:20]

Done.

 
   def _RunTest(self, failure_log, extractor_class, expected_signal_json,
-               bot='bot', master='master'):
+               bot='builder1', master='master1'):
     signal = extractor_class().Extract(
         failure_log, 'suite.test', 'step', bot, master)
     self.assertEqual(expected_signal_json, signal.ToDict())
 
   def testGeneralExtractor(self):
     failure_log = textwrap.dedent("""
         blabla WARNING: bla bla a/b/c.cc:20
 
         blabla d/e/f.cc:30
         blabla""")
@@ skipping 322 matching lines @@
                 'source': '../../a/b/x.cc',
                 'target': 'obj/a/b/x.o',
             },
             {
                 'target': 'target.exe'
             }
         ]
     }
 
     self._RunTest(
-        failure_log, extractors.CompileStepExtractor, expected_signal_json)
+        failure_log, extractors.CompileStepExtractor, expected_signal_json,
+        'builder2', 'master2')
 
   def testCompileStepExtractorExtractFailedTargetsLinuxOutsideFailure(self):
     failure_log = textwrap.dedent("""
         [1780/30023] blabla
         FAILED: blabla
         blabla
         1 error generated.
         FAILED with 1: blabla gomacc -c a/b.cc -o c/d.o blabla
         blabla
         Error: FAILED with 1: blabla
         ninja: build stopped: subcommand failed.
         blabla.""")
     expected_signal_json = {
         'files': {},
         'keywords': {},
         'failed_targets': [
             {
                 'source': 'a/b.cc',
                 'target': 'c/d.o'
             }
         ]
     }
 
     self._RunTest(
-        failure_log, extractors.CompileStepExtractor, expected_signal_json)
+        failure_log, extractors.CompileStepExtractor, expected_signal_json,
+        'builder2', 'master2')
 
   def testCompileStepExtractorExtractFailedLinkTargetsLinux(self):
     failure_log = textwrap.dedent("""
         [5430/5600] blabla
         FAILED: python blabla clang++ -o a/b.nexe blabla
         blabla
         blabla.Error: FAILED with blabla
         FAILED: blabla gomacc -o "target with spaces and quotes" blabla
         ninja: build stopped: subcommand failed.""")
     expected_signal_json = {
         'files': {},
         'keywords': {},
         'failed_targets': [
             {
                 'target': 'a/b.nexe'
             },
             {
                 'target': '"target with spaces and quotes"'
             }
         ]
     }
 
     self._RunTest(
-        failure_log, extractors.CompileStepExtractor, expected_signal_json)
+        failure_log, extractors.CompileStepExtractor, expected_signal_json,
+        'builder2', 'master2')
 
   def testCompileStepExtractorExtractFailedCompileTargetsWindows(self):
     failure_log = textwrap.dedent("""
         [4576/31353] blabla
         FAILED: ninja blabla /c ..\\..\\a\\b\\c.cc /Foa\\b.c.obj blabla
         blabla
         FAILED: ninja blabla /c ..\\..\\d\\e\\f.cc /Fod\\e\\f\\a.b.obj blabla
         blabla
         ninja: build stopped: subcommand failed.""")
     expected_signal_json = {
         'files': {},
         'keywords': {},
         'failed_targets': [
             {
                 'source': '..\\..\\a\\b\\c.cc',
                 'target': 'a\\b.c.obj',
             },
             {
                 'source': '..\\..\\d\\e\\f.cc',
                 'target': 'd\\e\\f\\a.b.obj'
             },
         ]
     }
 
     self._RunTest(failure_log, extractors.CompileStepExtractor,
-                  expected_signal_json)
+                  expected_signal_json, 'win_builder', 'win_master')
 
   def testCompileStepExtractorExtractFailedLinkTargetsWindows(self):
     failure_log = textwrap.dedent("""
         [11428/27088] blabla
         FAILED: blabla link.exe /OUT:test.exe @test.exe.rsp blabla
         ninja: build stopped: subcommand failed.""")
     expected_signal_json = {
         'files': {},
         'keywords': {},
         'failed_targets': [
             {
                 'target': 'test.exe'
             }
         ]
     }
 
     self._RunTest(
-        failure_log, extractors.CompileStepExtractor, expected_signal_json)
+        failure_log, extractors.CompileStepExtractor, expected_signal_json,
+        'builder2', 'master2')
 
   def testCompileStepNinjaErrorExtractor(self):
     """Test ninja error extraction in compile step."""
     failure_log = textwrap.dedent("""
         ninja -C /a/b/c/ all -j50
         ninja: Entering directory `../da/b/build/sl/M/'
         ninja: error: '../../r/w/c/sess.js', needed by 'ob/r/w/h.stamp',
         missing and no known rule to make it""")
     expected_signal_json = {
         'files': {
@@ skipping 39 matching lines @@
             'a/c/in_signal_5.cc': [],
             'a/c/in_signal_6.cc': []
         },
         'keywords': {}
     }
 
     self._RunTest(
         failure_log, extractors.CompileStepExtractor, expected_signal_json,
         'iOS_Simulator_(dbg)', 'chromium.mac')
 
-  def _MockEnableStrictRegexForCompileLinkFailures(self, enabled):
-    def Mocked_EnableStrictRegexForCompileLinkFailures(*_):
-      return enabled
-    self.mock(waterfall_config, 'EnableStrictRegexForCompileLinkFailures',
-              Mocked_EnableStrictRegexForCompileLinkFailures)
-
   def testCompileStepStrictRegexForCompileFailures(self):
-    self._MockEnableStrictRegexForCompileLinkFailures(True)
 
     goma_clang_prefix = (
         '/b/build/goma/gomacc '
         '../../third_party/llvm-build/Release+Asserts/bin/clang++ '
         '-MMD -MF')
     failure_log = textwrap.dedent("""
         [1832/2467 | 117.498] CXX obj/a/b/test.file.o
         blabla...
         FAILED: %s obj/a.o.d ... -c a.c -o obj/a.o
         blalba...
@@ skipping 15 matching lines @@
             {
                 'source': 'a.c',
                 'target': 'obj/a.o',
             },
         ]
     }
 
     self._RunTest(
         failure_log, extractors.CompileStepExtractor, expected_signal_json)
 
-
   def testCompileStepStrictRegexForLinkFailures(self):
-    self._MockEnableStrictRegexForCompileLinkFailures(True)
 
     goma_gcc_prefix = (
         '/b/build/slave/Linux/build/src/build/goma/client/gomacc '
         '/bla/bla/.../bin/arm-linux-androideabi-gcc')
     failure_log = textwrap.dedent("""
         [1832/2467 | 117.498] CXX obj/a/b/test.file.o
         blabla...
         FAILED: %s -Wl,-z,now ... -o exe -Wl,--start-group obj/a.o ...
         blalba...
         FAILED: cd a/b/c; python script.py a b c blabla....
@@ skipping 256 matching lines @@
         # step_name: result
         '1': '1',
         '2': '2',
         '32434': '0'
     }
 
     for step_name, expected_result in cases.iteritems():
       result = extractors.ExtractSignal(
           'master', 'bot', step_name, 'test', '')
       self.assertEqual(expected_result, result)