In update-test-expectation, skip lines with directories.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations.py
index 5d60a28a4514760b4b3eb1bfec171f3d125706fa..5b552d7b498976e36dcee20c6da71e822a021f1c 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/update_test_expectations.py
@@ -104,6 +104,11 @@ class RemoveFlakesOMatic(object):
         if not self._has_pass_expectation(expectations):
             return False
 
+        # Don't check lines that have expectations for directories, since
+        # the flakiness of all sub-tests isn't as easy to check.
+        if self._is_directory(test_expectation_line.name):
+            return False
+
         # The line can be deleted if the only expectation on the line that appears in the actual
         # results is the PASS expectation.
         builders_checked = []
@@ -191,6 +196,9 @@ class RemoveFlakesOMatic(object):
                                      'SKIP')
         return any(s in expectations for s in unstrippable_expectations)
 
+    def _is_directory(self, name):
+        return [name] != self._port.tests([name])

[bokan, 2017/02/07 20:06:28]

This will return true for tests files that don't exist or are typo'd. Maybe we
should also check that the path exists on the filesystem?

[qyearsley, 2017/02/07 21:22:42]

That sounds reasonable. In the latest patch I've now changed this to just
directly check whether the path on the test expectation line is a directory;
does the latest patch look OK?

+
     def _get_builder_results_by_path(self):
         """Returns a dictionary of results for each builder.