Rebaseline the actual missing results only

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 unittest
 
 from webkitpy.common.net.buildbot_mock import MockBuilder
 from webkitpy.common.net.layouttestresults import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.executive_mock import MockExecutive2
@@ skipping 816 matching lines @@
             "MOCK Mac10.11": {"port_name": "test-mac-mac10.11", "specifiers": ["Mac10.11", "Release"]},
         })
         self.command.execute(self.options, [], self.tool)
         self.assertEqual(self.tool.executive.calls, [])
 
         # The mac ports should both be removed since they're the only ones in builders._exact_matches.
         self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ Rebaseline ]
 """)
 
+    # TODO(crbug.com/574272) - Reenable this after the bug is fixed.
+    def disabled_test_rebaseline_missing(self):

[wkorman, 2016/06/14 19:09:19]

Intentionally disabled?

[Xianzhu, 2016/06/14 19:23:21]

Yes, along with other rebaseline tests because we disabled rebaseline
temporarily.

This test passes with rebaseline enabled.

+        def builder_data():
+            self.command._builder_data['MOCK Mac10.10'] = LayoutTestResults.results_from_string("""ADD_RESULTS({
+    "tests": {
+        "fast": {
+            "dom": {
+                "missing-text.html": {
+                    "expected": "PASS",
+                    "actual": "MISSING",
+                    "is_unexpected": true,
+                    "is_missing_text": true
+                },
+                "missing-text-and-image.html": {
+                    "expected": "PASS",
+                    "actual": "MISSING",
+                    "is_unexpected": true,
+                    "is_missing_text": true,
+                    "is_missing_image": true
+                },
+                "missing-image.html": {
+                    "expected": "PASS",
+                    "actual": "MISSING",
+                    "is_unexpected": true,
+                    "is_missing_image": true
+                }
+            }
+        }
+    }
+});""")
+            return self.command._builder_data
+
+        self.command.builder_data = builder_data
+
+        self._write('fast/dom/missing-text.html', "Dummy test contents")
+        self._write('fast/dom/missing-text-and-image.html', "Dummy test contents")
+        self._write('fast/dom/missing-image.html', "Dummy test contents")
+
+        self.command._tests_to_rebaseline = lambda port: {
+            'fast/dom/missing-text.html': set(['txt', 'png']),
+            'fast/dom/missing-text-and-image.html': set(['txt', 'png']),
+            'fast/dom/missing-image.html': set(['txt', 'png']),
+        }
+
+        self.tool.builders = BuilderList({
+            "MOCK Mac10.10": {"port_name": "test-mac-mac10.10", "specifiers": ["Mac10.10", "Release"]},
+        })
+        self.command.execute(self.options, [], self.tool)
+
+        print self.tool.executive.calls
+        self.assertEqual(self.tool.executive.calls, [
+            [
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
+                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/missing-text.html'],
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt,png',
+                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/missing-text-and-image.html'],
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png',
+                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/missing-image.html'],
+            ],
+            [
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
+                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/missing-text.html'],
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt,png',
+                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/missing-text-and-image.html'],
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
+                 '--builder', 'MOCK Mac10.10', '--test', 'fast/dom/missing-image.html'],
+            ]
+        ])
+
 
 class TestOptimizeBaselines(BaseTestCase):
     command_constructor = OptimizeBaselines
 
     def _write_test_file(self, port, path, contents):
         abs_path = self.tool.filesystem.join(port.layout_tests_dir(), path)
         self.tool.filesystem.write_text_file(abs_path, contents)
 
     def setUp(self):
         super(TestOptimizeBaselines, self).setUp()
@@ skipping 573 matching lines @@
                 ['git', 'cl', 'upload', '-f', '--auth-refresh-token-json', RIETVELD_REFRESH_TOKEN],
                 ['git', 'pull'],
                 ['git', 'cl', 'land', '-f', '-v', '--auth-refresh-token-json', RIETVELD_REFRESH_TOKEN],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
             ],
             auth_refresh_token_json=RIETVELD_REFRESH_TOKEN)
 
     def test_execute_with_dry_run(self):
         self._basic_execute_test([], dry_run=True)
         self.assertEqual(self.tool.scm().local_commits(), [])