Make update-flaky-tests to work again and support all bots

Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py

 # Copyright (C) 2013 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 117 matching lines @@
         results_json = self._results_json_for_port(port_name, builder_category)
         if not results_json:
             return None
         return BotTestExpectations(results_json)
 
 
 class BotTestExpectations(object):
     # FIXME: Get this from the json instead of hard-coding it.
     RESULT_TYPES_TO_IGNORE = ['N', 'X', 'Y']
 
-    def __init__(self, results_json):
+    # specifiers arg is used in unittests to avoid the static dependency on builders.
+    def __init__(self, results_json, specifiers=None):
         self.results_json = results_json
+        self.specifiers = specifiers or set(builders.specifiers_for_builder(results_json.builder_name))
 
     def _line_from_test_and_flaky_types_and_bug_urls(self, test_path, flaky_types, bug_urls):
         line = TestExpectationLine()
         line.original_string = test_path
         line.name = test_path
         line.filename = test_path
-        line.specifiers = bug_urls if bug_urls else ""
+        line.path = test_path  # FIXME: Should this be normpath?
+        line.matching_tests = [test_path]
+        line.bugs = bug_urls if bug_urls else ["Bug(gardener)"]
         line.expectations = sorted(map(self.results_json.expectation_for_type, flaky_types))
+        line.specifiers = self.specifiers
         return line
 
     def flakes_by_path(self, only_ignore_very_flaky):
         """Sets test expectations to bot results if there are at least two distinct results."""
         flakes_by_path = {}
         for test_path, entry in self.results_json.walk_results():
             results_dict = entry[self.results_json.RESULTS_KEY]
             flaky_types = self._flaky_types_in_results(results_dict, only_ignore_very_flaky)
             if len(flaky_types) <= 1:
                 continue
@@ skipping 38 matching lines @@
             additional_expectations = set(e for e in result_exp if not expected(e))
 
             # Test did not have unexpected results.
             if not additional_expectations:
                 continue
 
             expectations.update(additional_expectations)
             unexpected_results_by_path[test_path] = sorted(map(exp_to_string, expectations))
         return unexpected_results_by_path
 
-    def expectation_lines(self):
+    def expectation_lines(self, only_ignore_very_flaky=False):
         lines = []
         for test_path, entry in self.results_json.walk_results():
             results_array = entry[self.results_json.RESULTS_KEY]
-            flaky_types = self._flaky_types_in_results(results_array, False)
+            flaky_types = self._flaky_types_in_results(results_array, only_ignore_very_flaky)
             if len(flaky_types) > 1:
                 bug_urls = entry.get(self.results_json.BUGS_KEY)
                 line = self._line_from_test_and_flaky_types_and_bug_urls(test_path, flaky_types, bug_urls)
                 lines.append(line)
         return lines
 
     def _flaky_types_in_results(self, run_length_encoded_results, only_ignore_very_flaky=False):
         results_map = {}
         seen_results = {}
 
         for result_item in run_length_encoded_results:
             _, result_type = self.results_json.occurances_and_type_from_result_item(result_item)
             if result_type in self.RESULT_TYPES_TO_IGNORE:
                 continue
 
             if only_ignore_very_flaky and result_type not in seen_results:
                 # Only consider a short-lived result if we've seen it more than once.
                 # Otherwise, we include lots of false-positives due to tests that fail
                 # for a couple runs and then start passing.
                 # FIXME: Maybe we should make this more liberal and consider it a flake
                 # even if we only see that failure once.
                 seen_results[result_type] = True
                 continue
 
             results_map[result_type] = True
 
         return results_map.keys()