Fix orphaned wpt -expected.txt file deletion logic.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 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 643 matching lines @@
         """Returns a list of expectation (== or !=) and filename pairs"""
 
         # Try to extract information from reftest.list.
         reftest_list = self._get_reftest_list(test_name)
         if reftest_list:
             return reftest_list.get(self._filesystem.join(self.layout_tests_dir(), test_name), [])
 
         # Try to find -expected.* or -expected-mismatch.* in the same directory.
         reftest_list = []
         for expectation, prefix in (('==', ''), ('!=', '-mismatch')):
-            for extension in Port._supported_file_extensions:
+            for extension in Port.supported_file_extensions:
                 path = self.expected_filename(test_name, prefix + extension)
                 if self._filesystem.exists(path):
                     reftest_list.append((expectation, path))
         if reftest_list:
             return reftest_list
 
         # Try to extract information from MANIFEST.json.
         match = re.match(r'external/wpt/(.*)', test_name)
         if not match:
             return []
@@ skipping 14 matching lines @@
             tests.extend(self._all_virtual_tests(suites))
         return tests
 
     def real_tests(self, paths):
         # When collecting test cases, skip these directories.
         skipped_directories = set(['.svn', '_svn', 'platform', 'resources', 'support', 'script-tests', 'reference', 'reftest'])
         files = find_files.find(self._filesystem, self.layout_tests_dir(), paths,
                                 skipped_directories, functools.partial(Port.is_test_file, self), self.test_key)
         return self._convert_wpt_file_paths_to_url_paths([self.relative_test_filename(f) for f in files])
 
-    # When collecting test cases, we include any file with these extensions.
-    _supported_file_extensions = set(['.html', '.xml', '.xhtml', '.xht', '.pl',
-                                      '.htm', '.php', '.svg', '.mht', '.pdf'])
-
     @staticmethod
     # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well.
     def is_reference_html_file(filesystem, dirname, filename):
         if filename.startswith('ref-') or filename.startswith('notref-'):
             return True
         filename_without_ext, _ = filesystem.splitext(filename)
         for suffix in ['-expected', '-expected-mismatch', '-ref', '-notref']:
             if filename_without_ext.endswith(suffix):
                 return True
         return False
 
+    # When collecting test cases, we include any file with these extensions.
+    supported_file_extensions = set([
+        '.html', '.xml', '.xhtml', '.xht', '.pl',
+        '.htm', '.php', '.svg', '.mht', '.pdf',
+    ])
+
     @staticmethod
     def _has_supported_extension(filesystem, filename):
         """Returns True if filename is one of the file extensions we want to run a test on."""
         extension = filesystem.splitext(filename)[1]
-        return extension in Port._supported_file_extensions
+        return extension in Port.supported_file_extensions
 
     def is_test_file(self, filesystem, dirname, filename):
         match = re.search(r'[/\\]external[/\\]wpt([/\\].*)?$', dirname)
         if match:
             if match.group(1):
                 path_in_wpt = match.group(1)[1:].replace('\\', '/') + '/' + filename
             else:
                 path_in_wpt = filename
             return self._wpt_manifest().is_test_file(path_in_wpt)
         if 'inspector-unit' in dirname:
@@ skipping 906 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)