Chromium Code Reviews| Index: Tools/TestResultServer/handlers/buildershandler_unittest.py |
| diff --git a/Tools/TestResultServer/handlers/buildershandler_unittest.py b/Tools/TestResultServer/handlers/buildershandler_unittest.py |
| index dba82101680177438671a4bf7b58de0b9dcc0230..1ea9a14ebd41eab28ca55ce0cccad78b5d1fe96a 100644 |
| --- a/Tools/TestResultServer/handlers/buildershandler_unittest.py |
| +++ b/Tools/TestResultServer/handlers/buildershandler_unittest.py |
| @@ -1,4 +1,3 @@ |
| -#!/usr/bin/env python |
|
ojan
2014/06/09 21:39:16
Removed this to make presubmit happy. Presumably I
|
| # Copyright (C) 2012 Google Inc. All rights reserved. |
| # |
| # Redistribution and use in source and binary forms, with or without |
| @@ -96,11 +95,11 @@ class BuildersHandlerTest(unittest.TestCase): |
| return {'cachedBuilds': [], 'currentBuilds': []} |
| if url == 'http://build.chromium.org/p/chromium.webkit/json/builders/WebKit%20Linux/builds/2': |
| - return {'steps': [{'name': 'webkit_tests'}, {'name': 'browser_tests'}, {'name': 'mini_installer_test'}, {'name': 'archive_test_results'}, {'name': 'compile'}]} |
| + return {'steps': [{'name': 'foo_tests_only'}, {'name': 'webkit_tests'}, {'name': 'browser_tests'}, {'name': 'mini_installer_test'}, {'name': 'archive_test_results'}, {'name': 'compile'}]} |
| if url == 'http://build.chromium.org/p/chromium.webkit/json/builders/WebKit%20Win/builds/2': |
| - return {'steps': [{'name': 'webkit_tests'}, {'name': 'mini_installer_test'}, {'name': 'archive_test_results'}, {'name': 'compile'}]} |
| + return {'steps': [{'name': 'foo_tests_ignore'}, {'name': 'webkit_tests'}, {'name': 'mini_installer_test'}, {'name': 'archive_test_results'}, {'name': 'compile'}]} |
| if url == 'http://build.chromium.org/p/chromium.webkit/json/builders/WebKit%20Mac/builds/2': |
| - return {'steps': [{'name': 'browser_tests'}, {'name': 'mini_installer_test'}, {'name': 'archive_test_results'}, {'name': 'compile'}]} |
| + return {'steps': [{'name': 'foo_tests_perf'}, {'name': 'browser_tests'}, {'name': 'mini_installer_test'}, {'name': 'archive_test_results'}, {'name': 'compile'}]} |
| logging.error('Cannot fetch fake url: %s' % url) |
| @@ -132,7 +131,9 @@ class BuildersHandlerTest(unittest.TestCase): |
| 'browser_tests': {'builders': ['WebKit Linux', 'WebKit Mac']}, |
| 'mini_installer_test': {'builders': ['WebKit Linux', 'WebKit Mac', 'WebKit Win']}, |
| 'layout-tests': {'builders': ['WebKit Linux', 'WebKit Win']}}, |
| - 'name': 'ChromiumWebkit'}]} |
| + 'name': 'ChromiumWebkit'}], |
| + "no_upload_test_types": buildershandler.TEST_STEPS_THAT_DO_NOT_UPLOAD_YET, |
| + } |
| expected_json = buildershandler.dump_json(expected_masters) |
| self.assertEqual(buildbot_data, expected_json) |
| @@ -205,6 +206,5 @@ class BuildersHandlerTest(unittest.TestCase): |
| buildershandler.fetch_json = old_fetch_json |
| - |
| if __name__ == '__main__': |
| unittest.main() |