Use underscores to separate words in filenames in webkitpy.

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baseline_optimizer_unittest.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 10 matching lines @@
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import unittest
 
-from webkitpy.common.checkout.baselineoptimizer import BaselineOptimizer
+from webkitpy.common.checkout.baseline_optimizer import BaselineOptimizer
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.webkit_finder import WebKitFinder
 
 
 class BaselineOptimizerTest(unittest.TestCase):
 
     # Protected method _move_baselines is tested below - pylint: disable=protected-access
     def test_move_baselines(self):
         host = MockHost()
         host.filesystem.write_text_file('/mock-checkout/third_party/WebKit/LayoutTests/VirtualTestSuites', '[]')
@@ skipping 36 matching lines @@
             },
             {
                 '/mock-checkout/third_party/WebKit/LayoutTests/platform/linux': 'bbb',
                 '/mock-checkout/third_party/WebKit/LayoutTests': 'aaa',
             })
         self.assertEqual(
             host.filesystem.read_binary_file(
                 '/mock-checkout/third_party/WebKit/LayoutTests/another/test-expected.txt'),
             'result A')
 
-    def _assertOptimization(self, results_by_directory, expected_new_results_by_directory,
-                            baseline_dirname='', host=None):
+    def _assert_optimization(
+            self,
+            results_by_directory,
+            directory_to_new_results,
+            baseline_dirname='', host=None):
         if not host:
             host = MockHost()
         fs = host.filesystem
         webkit_base = WebKitFinder(fs).webkit_base()
         baseline_name = 'mock-baseline-expected.txt'
         fs.write_text_file(fs.join(webkit_base, 'LayoutTests', 'VirtualTestSuites'),
                            '[{"prefix": "gpu", "base": "fast/canvas", "args": ["--foo"]}]')
 
         for dirname, contents in results_by_directory.items():
             path = fs.join(webkit_base, 'LayoutTests', dirname, baseline_name)
             fs.write_binary_file(path, contents)
 
         baseline_optimizer = BaselineOptimizer(host, host.port_factory.get(
         ), host.port_factory.all_port_names())
         self.assertTrue(baseline_optimizer.optimize(fs.join(baseline_dirname, baseline_name)))
 
-        for dirname, contents in expected_new_results_by_directory.items():
+        for dirname, contents in directory_to_new_results.items():
             path = fs.join(webkit_base, 'LayoutTests', dirname, baseline_name)
             if contents is not None:
                 self.assertEqual(fs.read_binary_file(path), contents)
 
     def test_linux_redundant_with_win(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/win': '1',
                 'platform/linux': '1',
             },
             {
                 'platform/win': '1',
             })
 
     def test_covers_mac_win_linux(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/win': '1',
                 'platform/linux': '1',
                 '': None,
             },
             {
                 '': '1',
             })
 
     def test_overwrites_root(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/win': '1',
                 'platform/linux': '1',
                 '': '2',
             },
             {
                 '': '1',
             })
 
     def test_no_new_common_directory(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
                 '': '2',
             },
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
                 '': '2',
             })
 
     def test_local_optimization(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
                 'platform/linux-precise': '1',
             },
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
             })
 
     def test_local_optimization_skipping_a_port_in_the_middle(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac-snowleopard': '1',
                 'platform/win': '1',
                 'platform/linux': '1',
                 'platform/linux-precise': '1',
             },
             {
                 'platform/mac-snowleopard': '1',
                 'platform/win': '1',
             })
 
     def test_baseline_redundant_with_root(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/win': '2',
                 '': '2',
             },
             {
                 'platform/mac': '1',
                 '': '2',
             })
 
     def test_root_baseline_unused(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/win': '2',
                 '': '3',
             },
             {
                 'platform/mac': '1',
                 'platform/win': '2',
             })
 
     def test_root_baseline_unused_and_non_existant(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'platform/mac': '1',
                 'platform/win': '2',
             },
             {
                 'platform/mac': '1',
                 'platform/win': '2',
             })
 
     def test_virtual_root_redundant_with_actual_root(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'virtual/gpu/fast/canvas': '2',
                 'fast/canvas': '2',
             },
             {
                 'virtual/gpu/fast/canvas': None,
                 'fast/canvas': '2',
             },
             baseline_dirname='virtual/gpu/fast/canvas')
 
     def test_virtual_root_redundant_with_ancestors(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'virtual/gpu/fast/canvas': '2',
                 'platform/mac/fast/canvas': '2',
                 'platform/win/fast/canvas': '2',
             },
             {
                 'virtual/gpu/fast/canvas': None,
                 'fast/canvas': '2',
             },
             baseline_dirname='virtual/gpu/fast/canvas')
 
-    def test_virtual_root_redundant_with_ancestors_skip_scm_commands(self):
-        self._assertOptimization(
-            {
-                'virtual/gpu/fast/canvas': '2',
-                'platform/mac/fast/canvas': '2',
-                'platform/win/fast/canvas': '2',
-            },
-            {
-                'virtual/gpu/fast/canvas': None,
-                'fast/canvas': '2',
-            },
-            baseline_dirname='virtual/gpu/fast/canvas')
-
-    def test_virtual_root_redundant_with_ancestors_skip_scm_commands_with_file_not_in_scm(self):
-        self._assertOptimization(
-            {
-                'virtual/gpu/fast/canvas': '2',
-                'platform/mac/fast/canvas': '2',
-                'platform/win/fast/canvas': '2',
-            },
-            {
-                'virtual/gpu/fast/canvas': None,
-                'fast/canvas': '2',
-            },
-            baseline_dirname='virtual/gpu/fast/canvas',
-            host=MockHost())
-

[qyearsley, 2016/12/17 18:58:57]

As far as I can tell, these methods were both redundant.

[Dirk Pranke, 2016/12/18 02:46:41]

Acknowledged.

     def test_virtual_root_not_redundant_with_ancestors(self):
-        self._assertOptimization(
+        self._assert_optimization(
             {
                 'virtual/gpu/fast/canvas': '2',
                 'platform/mac/fast/canvas': '1',
             },
             {
                 'virtual/gpu/fast/canvas': '2',
                 'platform/mac/fast/canvas': '1',
             },
             baseline_dirname='virtual/gpu/fast/canvas')