Revert of Make Rebaseline/NeedsRebaseline/NeedsManualRebaseline not conflict with Pass lines.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.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 @@
         raise ValueError(expectation)
 
     def remove_expectation_line(self, test):
         if not self.has_test(test):
             return
         self._clear_expectations_for_test(test)
         del self._test_to_expectation_line[test]
 
     def add_expectation_line(self, expectation_line,
                              model_all_expectations=False):
+        """Returns a list of warnings encountered while matching specifiers."""
+
         if expectation_line.is_invalid():
             return
 
         for test in expectation_line.matching_tests:
-            lines_involve_rebaseline = False
-            prev_expectation_line = self.get_expectation_line(test)
+            if self._already_seen_better_match(test, expectation_line):
+                continue
 
-            if prev_expectation_line:
-                # The previous path matched more of the test.
-                if len(prev_expectation_line.path) > len(expectation_line.path):
-                    continue
-
-                if self._lines_conflict(prev_expectation_line, expectation_line):
-                    continue
-
-                lines_involve_rebaseline = self._expects_rebaseline(prev_expectation_line) or self._expects_rebaseline(expectation_line)
-
-            # Exact path matches that conflict should be merged, e.g.
-            # [ Pass Timeout ] + [ NeedsRebaseline ] ==> [ Pass Timeout NeedsRebaseline ].
-            if model_all_expectations or lines_involve_rebaseline:
-                expectation_line = TestExpectationLine.merge_expectation_lines(prev_expectation_line, expectation_line, model_all_expectations)
+            if model_all_expectations:
+                expectation_line = TestExpectationLine.merge_expectation_lines(self.get_expectation_line(test), expectation_line, model_all_expectations)
 
             self._clear_expectations_for_test(test)
             self._test_to_expectation_line[test] = expectation_line
             self._add_test(test, expectation_line)
 
     def _add_test(self, test, expectation_line):
         """Sets the expected state for a given test.
 
         This routine assumes the test has not been added before. If it has,
         use _clear_expectations_for_test() to reset the state prior to
@@ skipping 33 matching lines @@
     def _remove_from_sets(self, test, dict_of_sets_of_tests):
         """Removes the given test from the sets in the dictionary.
 
         Args:
           test: test to look for
           dict: dict of sets of files"""
         for set_of_tests in dict_of_sets_of_tests.itervalues():
             if test in set_of_tests:
                 set_of_tests.remove(test)
 
-    def _expects_rebaseline(self, expectation_line):
-        expectations = expectation_line.parsed_expectations
-        return REBASELINE in expectations or NEEDS_REBASELINE in expectations or NEEDS_MANUAL_REBASELINE in expectations
+    def _already_seen_better_match(self, test, expectation_line):
+        """Returns whether we've seen a better match already in the file.
 
-    def _lines_conflict(self, prev_expectation_line, expectation_line):
-        if prev_expectation_line.path != expectation_line.path:
+        Returns True if we've already seen a expectation_line.name that matches more of the test
+            than this path does
+        """
+        # FIXME: See comment below about matching test configs and specificity.
+        if not self.has_test(test):
+            # We've never seen this test before.
             return False
 
-        if PASS in expectation_line.parsed_expectations and self._expects_rebaseline(prev_expectation_line):
+        prev_expectation_line = self._test_to_expectation_line[test]
+
+        if prev_expectation_line.filename != expectation_line.filename:
+            # We've moved on to a new expectation file, which overrides older ones.
             return False
 
-        if PASS in prev_expectation_line.parsed_expectations and self._expects_rebaseline(expectation_line):
+        if len(prev_expectation_line.path) > len(expectation_line.path):
+            # The previous path matched more of the test.
+            return True
+
+        if len(prev_expectation_line.path) < len(expectation_line.path):
+            # This path matches more of the test.
             return False
 
+        # At this point we know we have seen a previous exact match on this
+        # base path, so we need to check the two sets of specifiers.
+
+        # FIXME: This code was originally designed to allow lines that matched
+        # more specifiers to override lines that matched fewer specifiers.
+        # However, we currently view these as errors.
+        #
+        # To use the "more specifiers wins" policy, change the errors for overrides
+        # to be warnings and return False".
+
         if prev_expectation_line.matching_configurations == expectation_line.matching_configurations:
             expectation_line.warnings.append('Duplicate or ambiguous entry lines %s:%s and %s:%s.' % (
                 self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers,
                 self._shorten_filename(expectation_line.filename), expectation_line.line_numbers))
             return True
 
         if prev_expectation_line.matching_configurations >= expectation_line.matching_configurations:
             expectation_line.warnings.append('More specific entry for %s on line %s:%s overrides line %s:%s.' % (expectation_line.name,
                 self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers,
                 self._shorten_filename(expectation_line.filename), expectation_line.line_numbers))
@@ skipping 364 matching lines @@
             # If reconstitute_only_these is an empty list, we want to return original_string.
             # So we need to compare reconstitute_only_these to None, not just check if it's falsey.
             if reconstitute_only_these is None or expectation_line in reconstitute_only_these:
                 return expectation_line.to_string(test_configuration_converter)
             return expectation_line.original_string
 
         def nones_out(expectation_line):
             return expectation_line is not None
 
         return "\n".join(filter(nones_out, map(serialize, expectation_lines)))