Simplification: Remove support for specifying suffix lists when rebaselining.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

 # Copyright 2016 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 optparse
 import unittest
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.layout_test_results import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive
@@ skipping 311 matching lines @@
 class TestAbstractParallelRebaselineCommand(BaseTestCase):
     command_constructor = AbstractParallelRebaselineCommand
 
     def test_builders_to_fetch_from(self):
         builders_to_fetch = self.command._builders_to_fetch_from(
             ['MOCK Win10', 'MOCK Win7 (dbg)(1)', 'MOCK Win7 (dbg)(2)', 'MOCK Win7'])
         self.assertEqual(builders_to_fetch, ['MOCK Win7', 'MOCK Win10'])
 
     def test_all_baseline_paths(self):
         test_prefix_list = {
-            'passes/text.html': {
-                Build('MOCK Win7'): ('txt', 'png'),
-                Build('MOCK Win10'): ('txt',),
-            }
+            'passes/text.html': [
+                Build('MOCK Win7'),
+                Build('MOCK Win10'),
+            ]
         }
         # pylint: disable=protected-access
         baseline_paths = self.command._all_baseline_paths(test_prefix_list)
         self.assertEqual(baseline_paths, [
             '/test.checkout/LayoutTests/passes/text-expected.png',
             '/test.checkout/LayoutTests/passes/text-expected.txt',
+            '/test.checkout/LayoutTests/passes/text-expected.wav',
+            '/test.checkout/LayoutTests/platform/test-win-win10/passes/text-expected.png',
             '/test.checkout/LayoutTests/platform/test-win-win10/passes/text-expected.txt',
+            '/test.checkout/LayoutTests/platform/test-win-win10/passes/text-expected.wav',
             '/test.checkout/LayoutTests/platform/test-win-win7/passes/text-expected.png',
             '/test.checkout/LayoutTests/platform/test-win-win7/passes/text-expected.txt',
+            '/test.checkout/LayoutTests/platform/test-win-win7/passes/text-expected.wav',
         ])
 
     def test_remove_all_pass_testharness_baselines(self):
         self.tool.filesystem.write_text_file(
             '/test.checkout/LayoutTests/passes/text-expected.txt',
             ('This is a testharness.js-based test.\n'
              'PASS: foo\n'
              'Harness: the test ran to completion.\n'))
         test_prefix_list = {
-            'passes/text.html': {
-                Build('MOCK Win7'): ('txt', 'png'),
-                Build('MOCK Win10'): ('txt',),
-            }
+            'passes/text.html': [
+                Build('MOCK Win7'),
+                Build('MOCK Win10'),
+            ]
         }
         self.command._remove_all_pass_testharness_baselines(test_prefix_list)
         self.assertFalse(self.tool.filesystem.exists(
             '/test.checkout/LayoutTests/passes/text-expected.txt'))
 
 
 class TestRebaselineJson(BaseTestCase):
     command_constructor = RebaselineJson
 
     def setUp(self):
@@ skipping 326 matching lines @@
                             'expected': 'FAIL',
                             'actual': 'IMAGE+TEXT'
                         }
                     }
                 }
             }))
 
         self._write('userscripts/another-test.html', 'Dummy test contents')
         self._write('userscripts/images.svg', 'Dummy test contents')
         self.command._tests_to_rebaseline = lambda port: {
-            'userscripts/another-test.html': set(['txt']),
-            'userscripts/images.svg': set(['png']),
-            'userscripts/not-actually-failing.html': set(['txt', 'png', 'wav']),
+            'userscripts/another-test.html',
+            'userscripts/images.svg',
+            'userscripts/not-actually-failing.html',
         }
 
         self.command.execute(self.options(), [], self.tool)
 
         self.assertEqual(self.tool.executive.calls, [
             [
                 ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
                  '--builder', 'MOCK Mac10.10', '--test', 'userscripts/another-test.html'],
                 ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
                  '--builder', 'MOCK Mac10.11', '--test', 'userscripts/another-test.html'],
-                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png',
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt,png',
                  '--builder', 'MOCK Mac10.10', '--test', 'userscripts/images.svg'],
-                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png',
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt,png',
                  '--builder', 'MOCK Mac10.11', '--test', 'userscripts/images.svg'],
             ],
             [
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
                  '--builder', 'MOCK Mac10.10', '--test', 'userscripts/another-test.html'],
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
                  '--builder', 'MOCK Mac10.11', '--test', 'userscripts/another-test.html'],
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt,png',
                  '--builder', 'MOCK Mac10.10', '--test', 'userscripts/images.svg'],
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt,png',
                  '--builder', 'MOCK Mac10.11', '--test', 'userscripts/images.svg'],
             ],
         ])
 
     def test_rebaseline_expectations_reftests(self):
         self._zero_out_test_expectations()
 
         self.tool.executive = MockExecutive()
 
         for builder in ['MOCK Mac10.10', 'MOCK Mac10.11']:
@@ skipping 67 matching lines @@
                           'Bug(y) userscripts/test.html [ Crash ]\n')}
         self._write('/userscripts/another-test.html', '')
 
         self.assertDictEqual(self.command._tests_to_rebaseline(self.mac_port),
                              {'userscripts/another-test.html': set(['png', 'txt', 'wav'])})
         self.assertEqual(self._read(self.mac_expectations_path), '')
 
     def test_rebaseline_without_other_expectations(self):
         self._write('userscripts/another-test.html', 'Dummy test contents')
         self._write(self.mac_expectations_path, 'Bug(x) userscripts/another-test.html [ Rebaseline ]\n')
-        self.assertDictEqual(self.command._tests_to_rebaseline(self.mac_port),
-                             {'userscripts/another-test.html': ('png', 'wav', 'txt')})
+        self.assertEqual(self.command._tests_to_rebaseline(self.mac_port), ['userscripts/another-test.html'])
 
     def test_rebaseline_test_passes_everywhere(self):
         test_port = self.tool.port_factory.get('test')
 
         for builder in ['MOCK Mac10.10', 'MOCK Mac10.11']:
             self.tool.buildbot.set_results(Build(builder), LayoutTestResults({
                 'tests': {
                     'fast': {
                         'dom': {
                             'prototype-taco.html': {
@@ skipping 98 matching lines @@
         for cmd_line, cwd in commands:
             out = self.run_command(cmd_line, cwd=cwd)
             if 'rebaseline-test-internal' in cmd_line:
                 out = '{"remove-lines": [{"test": "%s", "builder": "%s"}]}\n' % (cmd_line[8], cmd_line[6])
             command_outputs.append([0, out, ''])
 
         new_calls = self.calls[num_previous_calls:]
         self.calls = self.calls[:num_previous_calls]
         self.calls.append(new_calls)
         return command_outputs