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):

[Dirk Pranke, 2014/05/29 18:25:21]

Can you make specifiers be required and just pass it in from the factory? 

[Dirk Pranke, 2014/05/29 21:06:46]

I think you missed this comment?

         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 70 matching lines @@
                 # 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()