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

Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations_unittest.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 24 matching lines @@
 class BotTestExpectationsTest(unittest.TestCase):
     # FIXME: Find a way to import this map from Tools/TestResultServer/model/jsonresults.py.
     FAILURE_MAP = {"A": "AUDIO", "C": "CRASH", "F": "TEXT", "I": "IMAGE", "O": "MISSING",
         "N": "NO DATA", "P": "PASS", "T": "TIMEOUT", "Y": "NOTRUN", "X": "SKIP", "Z": "IMAGE+TEXT", "K": "LEAK"}
 
     # All result_string's in this file expect newest result
     # on left: "PFF", means it just passed after 2 failures.
 
     def _assert_is_flaky(self, results_string, should_be_flaky):
         results_json = self._results_json_from_test_data({})
-        expectations = bot_test_expectations.BotTestExpectations(results_json)
+        expectations = bot_test_expectations.BotTestExpectations(results_json, set('test'))
         length_encoded = self._results_from_string(results_string)['results']
         num_actual_results = len(expectations._flaky_types_in_results(length_encoded, only_ignore_very_flaky=True))
         if should_be_flaky:
             self.assertGreater(num_actual_results, 1)
         else:
             self.assertEqual(num_actual_results, 1)
 
     def test_basic_flaky(self):
         self._assert_is_flaky('PFF', False)  # Used to fail, but now passes.
         self._assert_is_flaky('FFP', False)  # Just started failing.
@@ skipping 17 matching lines @@
         last_char = None
         for char in results_string:
             if char != last_char:
                 results_list.insert(0, [1, char])
             else:
                 results_list[0][0] += 1
         return {'results': results_list}
 
     def _assert_expectations(self, test_data, expectations_string, only_ignore_very_flaky):
         results_json = self._results_json_from_test_data(test_data)
-        expectations = bot_test_expectations.BotTestExpectations(results_json)
+        expectations = bot_test_expectations.BotTestExpectations(results_json, set('test'))
         self.assertEqual(expectations.flakes_by_path(only_ignore_very_flaky), expectations_string)
 
     def _assert_unexpected_results(self, test_data, expectations_string):
         results_json = self._results_json_from_test_data(test_data)
-        expectations = bot_test_expectations.BotTestExpectations(results_json)
+        expectations = bot_test_expectations.BotTestExpectations(results_json, set('test'))
         self.assertEqual(expectations.unexpected_results_by_path(), expectations_string)
 
     def test_basic(self):
         test_data = {
             'tests': {
                 'foo': {
                     'veryflaky.html': self._results_from_string('FPFP'),
                     'maybeflaky.html': self._results_from_string('PPFP'),
                     'notflakypass.html': self._results_from_string('PPPP'),
                     'notflakyfail.html': self._results_from_string('FFFF'),
@@ skipping 56 matching lines @@
         self._assert_unexpected_results(test_data, {
             'foo/pass1.html': sorted(["FAIL", "PASS"]),
             'foo/pass2.html': sorted(["IMAGE", "PASS"]),
             'foo/fail.html': sorted(["TEXT", "PASS"]),
             'foo/f_p.html': sorted(["TEXT", "PASS"]),
             'foo/crash.html': sorted(["WONTFIX", "CRASH", "TEXT"]),
             'foo/image.html': sorted(["CRASH", "FAIL", "IMAGE"]),
             'foo/i_f.html': sorted(["PASS", "IMAGE", "TEXT"]),
             'foo/all.html': sorted(["TEXT", "PASS", "IMAGE+TEXT", "TIMEOUT", "CRASH", "IMAGE", "MISSING", "LEAK"]),
         })