Update all non-generic test expectations files for removed tests when updating w3c tests.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

 # Copyright 2014 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.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also attempt to
 upload a CL, triggery try jobs, and make any changes that are required for
 new failing tests before committing.
 """
 
 import argparse
 import json
 
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.webkit_finder import WebKitFinder
-from webkitpy.layout_tests.models.test_expectations import TestExpectations
+from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
 
 # Import destination directories (under LayoutTests/imported/).
 WPT_DEST_NAME = 'wpt'
 CSS_DEST_NAME = 'csswg-test'
 
 # Our mirrors of the official w3c repos, which we pull from.
 WPT_REPO_URL = 'https://chromium.googlesource.com/external/w3c/web-platform-tests.git'
 CSS_REPO_URL = 'https://chromium.googlesource.com/external/w3c/csswg-test.git'
 
 POLL_DELAY_SECONDS = 900
@@ skipping 161 matching lines @@
         for subpath in previous_baselines:
             full_path = self.fs.join(dest_path, subpath)
             if self.fs.glob(full_path.replace('-expected.txt', '*')) == [full_path]:
                 self.fs.remove(full_path)
 
         if not keep_w3c_repos_around:
             self.print_('## Deleting temp repo directory %s.' % temp_repo_path)
             self.rmtree(temp_repo_path)
 
         self.print_('## Updating TestExpectations for any removed or renamed tests.')
-        self.update_test_expectations(self._list_deleted_tests(), self._list_renamed_tests())
+        self.update_all_test_expectations_files(self._list_deleted_tests(), self._list_renamed_tests())
 
         return '%s@%s' % (dest_dir_name, master_commitish)
 
     def commit_changes_if_needed(self, chromium_commitish, import_commitish):
         if self.run(['git', 'diff', '--quiet', 'HEAD'], exit_on_failure=False)[0]:
             self.print_('## Committing changes.')
             commit_msg = ('Import %s\n'
                           '\n'
                           'Using update-w3c-deps in Chromium %s.\n'
                           % (import_commitish, chromium_commitish))
@@ skipping 175 matching lines @@
 
     def fetch_new_expectations_and_baselines(self):
         """Adds new expectations and downloads baselines based on try job results, then commits and uploads the change."""
         self.print_('## Adding test expectations lines to LayoutTests/TestExpectations.')
         script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c-test-expectations')
         self.run([self.host.executable, script_path, '--verbose'])
         message = 'Modify TestExpectations or download new baselines for tests.'
         self.check_run(['git', 'commit', '-a', '-m', message])
         self.git_cl.run(['upload', '-m', message, '--rietveld'])
 
-    def update_test_expectations(self, deleted_tests, renamed_tests):
-        """Updates the TestExpectations file entries for tests that have been deleted or renamed."""
+    def update_all_test_expectations_files(self, deleted_tests, renamed_tests):
+        """Updates all test expectations files for tests that have been deleted or renamed."""
         port = self.host.port_factory.get()
-        test_expectations = TestExpectations(port, include_overrides=False)
-        # Tests for which files don't exist aren't stored in TestExpectationsModel,
-        # so methods like TestExpectations.remove_expectation_line don't work; instead
-        # we can run through the TestExpectationLine objects that were parsed.
+        for path, file_contents in port.all_expectations_dict().iteritems():
+
+            parser = TestExpectationParser(port, all_tests=None, is_lint_mode=False)
+            expectation_lines = parser.parse(path, file_contents)
+            self._update_single_test_expectations_file(path, expectation_lines, deleted_tests, renamed_tests)
+
+    def _update_single_test_expectations_file(self, path, expectation_lines, deleted_tests, renamed_tests):
+        """Updates single test expectations file."""
         # FIXME: This won't work for removed or renamed directories with test expectations
         # that are directories rather than individual tests.
         new_lines = []
         changed_lines = []
-        for expectation_line in test_expectations.expectations():
+        for expectation_line in expectation_lines:
             if expectation_line.name in deleted_tests:
                 continue
             if expectation_line.name in renamed_tests:
                 expectation_line.name = renamed_tests[expectation_line.name]
                 # Upon parsing the file, a "path does not exist" warning is expected
                 # to be there for tests that have been renamed, and if there are warnings,
                 # then the original string is used. If the warnings are reset, then the
                 # expectation line is re-serialized when output.
                 expectation_line.warnings = []
                 changed_lines.append(expectation_line)
             new_lines.append(expectation_line)
-        self.host.filesystem.write_text_file(
-            port.path_to_generic_test_expectations_file(),
-            TestExpectations.list_to_string(new_lines, reconstitute_only_these=changed_lines))
+        new_file_contents = TestExpectations.list_to_string(new_lines, reconstitute_only_these=changed_lines)
+        self.host.filesystem.write_text_file(path, new_file_contents)
 
     def _list_deleted_tests(self):
         """Returns a list of layout tests that have been deleted."""
         out = self.check_run(['git', 'diff', 'origin/master', '--diff-filter=D', '--name-only'])
         deleted_tests = []
         for line in out.splitlines():
             test = self.finder.layout_test_name(line)
             if test:
                 deleted_tests.append(test)
         return deleted_tests
 
     def _list_renamed_tests(self):
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests