| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import glob | 6 import glob |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import subprocess | 10 import subprocess |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 657 | 657 |
| 658 for (filename, _, expected_error) in test_data: | 658 for (filename, _, expected_error) in test_data: |
| 659 actual_error = PRESUBMIT._GetIDLParseError(input_api, filename) | 659 actual_error = PRESUBMIT._GetIDLParseError(input_api, filename) |
| 660 self.assertTrue(expected_error in str(actual_error), | 660 self.assertTrue(expected_error in str(actual_error), |
| 661 "'%s' not found in '%s'" % (expected_error, actual_error)) | 661 "'%s' not found in '%s'" % (expected_error, actual_error)) |
| 662 | 662 |
| 663 | 663 |
| 664 class TryServerMasterTest(unittest.TestCase): | 664 class TryServerMasterTest(unittest.TestCase): |
| 665 def testTryServerMasters(self): | 665 def testTryServerMasters(self): |
| 666 bots = { | 666 bots = { |
| 667 'tryserver.chromium.gpu': [ | |
| 668 'win_gpu', | |
| 669 'win_gpu_triggered_tests', | |
| 670 ], | |
| 671 'tryserver.chromium.mac': [ | 667 'tryserver.chromium.mac': [ |
| 672 'ios_dbg_simulator', | 668 'ios_dbg_simulator', |
| 673 'ios_rel_device', | 669 'ios_rel_device', |
| 674 'ios_rel_device_ninja', | 670 'ios_rel_device_ninja', |
| 675 'mac_asan', | 671 'mac_asan', |
| 676 'mac_asan_64', | 672 'mac_asan_64', |
| 677 'mac_chromium_compile_dbg', | 673 'mac_chromium_compile_dbg', |
| 678 'mac_chromium_compile_rel', | 674 'mac_chromium_compile_rel', |
| 679 'mac_chromium_dbg', | 675 'mac_chromium_dbg', |
| 680 'mac_chromium_rel', | 676 'mac_chromium_rel', |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 } | 751 } |
| 756 for master, bots in bots.iteritems(): | 752 for master, bots in bots.iteritems(): |
| 757 for bot in bots: | 753 for bot in bots: |
| 758 self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot), | 754 self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot), |
| 759 'bot=%s: expected %s, computed %s' % ( | 755 'bot=%s: expected %s, computed %s' % ( |
| 760 bot, master, PRESUBMIT.GetTryServerMasterForBot(bot))) | 756 bot, master, PRESUBMIT.GetTryServerMasterForBot(bot))) |
| 761 | 757 |
| 762 | 758 |
| 763 if __name__ == '__main__': | 759 if __name__ == '__main__': |
| 764 unittest.main() | 760 unittest.main() |
| OLD | NEW |