| 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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 for (filename, _, expected_error) in test_data: | 591 for (filename, _, expected_error) in test_data: |
| 592 actual_error = PRESUBMIT._GetIDLParseError(input_api, filename) | 592 actual_error = PRESUBMIT._GetIDLParseError(input_api, filename) |
| 593 self.assertTrue(expected_error in str(actual_error), | 593 self.assertTrue(expected_error in str(actual_error), |
| 594 "'%s' not found in '%s'" % (expected_error, actual_error)) | 594 "'%s' not found in '%s'" % (expected_error, actual_error)) |
| 595 | 595 |
| 596 | 596 |
| 597 class TryServerMasterTest(unittest.TestCase): | 597 class TryServerMasterTest(unittest.TestCase): |
| 598 def testTryServerMasters(self): | 598 def testTryServerMasters(self): |
| 599 bots = { | 599 bots = { |
| 600 'tryserver.chromium.gpu': [ | 600 'tryserver.chromium.gpu': [ |
| 601 'linux_gpu', | |
| 602 'linux_gpu_triggered_tests', | |
| 603 'win_gpu', | 601 'win_gpu', |
| 604 'win_gpu_triggered_tests', | 602 'win_gpu_triggered_tests', |
| 605 ], | 603 ], |
| 606 'tryserver.chromium.mac': [ | 604 'tryserver.chromium.mac': [ |
| 607 'ios_dbg_simulator', | 605 'ios_dbg_simulator', |
| 608 'ios_rel_device', | 606 'ios_rel_device', |
| 609 'ios_rel_device_ninja', | 607 'ios_rel_device_ninja', |
| 610 'mac_asan', | 608 'mac_asan', |
| 611 'mac_asan_64', | 609 'mac_asan_64', |
| 612 'mac_chromium_compile_dbg', | 610 'mac_chromium_compile_dbg', |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 } | 688 } |
| 691 for master, bots in bots.iteritems(): | 689 for master, bots in bots.iteritems(): |
| 692 for bot in bots: | 690 for bot in bots: |
| 693 self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot), | 691 self.assertEqual(master, PRESUBMIT.GetTryServerMasterForBot(bot), |
| 694 'bot=%s: expected %s, computed %s' % ( | 692 'bot=%s: expected %s, computed %s' % ( |
| 695 bot, master, PRESUBMIT.GetTryServerMasterForBot(bot))) | 693 bot, master, PRESUBMIT.GetTryServerMasterForBot(bot))) |
| 696 | 694 |
| 697 | 695 |
| 698 if __name__ == '__main__': | 696 if __name__ == '__main__': |
| 699 unittest.main() | 697 unittest.main() |
| OLD | NEW |