When rebaselining testharness tests with new all-PASS results, remove the baseline.

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.layouttestresults import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
@@ skipping 263 matching lines @@
         new_expectations = self._read(self.mac_expectations_path)
         self.assertMultiLineEqual(
             new_expectations,
             ("Bug(B) [ Mac Linux Win7 Debug ] fast/dom/Window/window-postmessage-clone-really-deep-array.html [ Pass ]\n"
              "Bug(A) [ Debug ] : fast/css/large-list-of-rules-crash.html [ Failure ]\n"))
 
     def test_rebaseline_test(self):
         self.command._rebaseline_test("MOCK Trusty", "userscripts/another-test.html", "txt", self.WEB_PREFIX)
         self.assertItemsEqual(self.tool.web.urls_fetched, [self.WEB_PREFIX + '/userscripts/another-test-actual.txt'])
 
+    def test_rebaseline_all_pass_testharness_result_removes_baseline(self):
+        self.tool.web.urls = {
+            ('https://storage.googleapis.com/chromium-layout-test-archives'
+             '/MOCK_Win7/results/layout-test-results/failures/unexpected'
+             '/text-actual.txt'): 'This is a testharness.js-based test.\n PASS: foo \n Harness: the test ran to completion.'
+        }
+        self._write(
+            '/test.checkout/LayoutTests/platform/test-win-win7/failures/unexpected/text-expected.txt',
+            'original baseline')
+        oc = OutputCapture()
+        oc.capture_output()
+        self.command.execute(self.options(builder='MOCK Win7', test="failures/unexpected/text.html"), [], self.tool)
+        out, _, _ = oc.restore_output()
+        self.assertEqual('{"remove-lines": [{"test": "failures/unexpected/text.html", "builder": "MOCK Win7"}]}\n', out)
+        self.assertFalse(self.tool.filesystem.exists(
+            '/test.checkout/LayoutTests/platform/test-win-win7/failures/unexpected/text-expected.txt'))
+
+    def test_rebaseline_test_non_all_pass_testharness_result(self):
+        self.tool.web.urls = {
+            ('https://storage.googleapis.com/chromium-layout-test-archives/MOCK_Win7'
+             '/results/layout-test-results/failures/unexpected/text-actual.txt'):
+            ('This is some other baseline content, not an all-pass testharness.js result.')}
+        self._write(
+            '/test.checkout/LayoutTests/platform/test-win-win7/failures/unexpected/text-expected.txt',
+            'original baseline')
+        oc = OutputCapture()
+        oc.capture_output()
+        self.command.execute(self.options(builder='MOCK Win7', test="failures/unexpected/text.html"), [], self.tool)
+        out, _, _ = oc.restore_output()
+        self.assertEqual('{"remove-lines": [{"test": "failures/unexpected/text.html", "builder": "MOCK Win7"}]}\n', out)
+        self.assertTrue(self.tool.filesystem.exists(
+            '/test.checkout/LayoutTests/platform/test-win-win7/failures/unexpected/text-expected.txt'))
+
     def test_rebaseline_test_with_results_directory(self):
         self._write("userscripts/another-test.html", "test data")
         self._write(
             self.mac_expectations_path,
             ("Bug(x) [ Mac ] userscripts/another-test.html [ Failure ]\n"
              "bug(z) [ Linux ] userscripts/another-test.html [ Failure ]\n"))
         self.command._rebaseline_test_and_update_expectations(self.options(results_directory='/tmp'))
         self.assertItemsEqual(self.tool.web.urls_fetched, ['file:///tmp/userscripts/another-test-actual.txt'])
 
     def test_rebaseline_reftest(self):
@@ skipping 600 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