[Findit] Adding central config test class for unit tests

appengine/findit/waterfall/test/extractors_test.py

Index: appengine/findit/waterfall/test/extractors_test.py
diff --git a/appengine/findit/waterfall/test/extractors_test.py b/appengine/findit/waterfall/test/extractors_test.py
index 6276af7599c47e53ddbc8281a22532e62d7979cb..84513cd5130898e472416ddc97d79deabd34e19a 100644
--- a/appengine/findit/waterfall/test/extractors_test.py
+++ b/appengine/findit/waterfall/test/extractors_test.py
@@ -4,16 +4,18 @@
 
 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())
@@ -356,7 +358,8 @@ Note:You can safely ignore the above warning unless this call should not happen.
     }
 
     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("""
@@ -381,7 +384,8 @@ Note:You can safely ignore the above warning unless this call should not happen.
     }
 
     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("""
@@ -405,7 +409,8 @@ Note:You can safely ignore the above warning unless this call should not happen.
     }
 
     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("""
@@ -431,7 +436,7 @@ Note:You can safely ignore the above warning unless this call should not happen.
     }
 
     self._RunTest(failure_log, extractors.CompileStepExtractor,
-                  expected_signal_json)
+                  expected_signal_json, 'win_builder', 'win_master')
 
   def testCompileStepExtractorExtractFailedLinkTargetsWindows(self):
     failure_log = textwrap.dedent("""
@@ -449,7 +454,8 @@ Note:You can safely ignore the above warning unless this call should not happen.
     }
 
     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."""
@@ -509,14 +515,7 @@ Note:You can safely ignore the above warning unless this call should not happen.
         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 '
@@ -552,9 +551,7 @@ Note:You can safely ignore the above warning unless this call should not happen.
     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 '