| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # coding=utf-8 | 2 # coding=utf-8 |
| 3 # Copyright 2015 The LUCI Authors. All rights reserved. | 3 # Copyright 2015 The LUCI Authors. All rights reserved. |
| 4 # Use of this source code is governed under the Apache License, Version 2.0 | 4 # Use of this source code is governed under the Apache License, Version 2.0 |
| 5 # that can be found in the LICENSE file. | 5 # that can be found in the LICENSE file. |
| 6 | 6 |
| 7 import base64 | 7 import base64 |
| 8 import datetime | 8 import datetime |
| 9 import json | 9 import json |
| 10 import logging | 10 import logging |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 import webtest | 21 import webtest |
| 22 | 22 |
| 23 from components import ereporter2 | 23 from components import ereporter2 |
| 24 from components import utils | 24 from components import utils |
| 25 | 25 |
| 26 import handlers_bot | 26 import handlers_bot |
| 27 import handlers_endpoints | 27 import handlers_endpoints |
| 28 import swarming_rpcs | 28 import swarming_rpcs |
| 29 | 29 |
| 30 from server import acl | 30 from server import acl |
| 31 from server import bot_code |
| 31 from server import bot_management | 32 from server import bot_management |
| 32 from server import config | 33 from server import config |
| 33 from server import large | 34 from server import large |
| 34 from server import task_pack | 35 from server import task_pack |
| 35 from server import task_request | 36 from server import task_request |
| 36 from server import task_result | 37 from server import task_result |
| 37 | 38 |
| 38 | 39 |
| 39 def message_to_dict(rpc_message): | 40 def message_to_dict(rpc_message): |
| 40 return json.loads(protojson.encode_message(rpc_message)) | 41 return json.loads(protojson.encode_message(rpc_message)) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 61 # Client API test cases run by default as user. | 62 # Client API test cases run by default as user. |
| 62 self.set_as_user() | 63 self.set_as_user() |
| 63 | 64 |
| 64 | 65 |
| 65 class ServerApiTest(BaseTest): | 66 class ServerApiTest(BaseTest): |
| 66 api_service_cls = handlers_endpoints.SwarmingServerService | 67 api_service_cls = handlers_endpoints.SwarmingServerService |
| 67 | 68 |
| 68 def test_details(self): | 69 def test_details(self): |
| 69 """Asserts that server_details returns the correct version.""" | 70 """Asserts that server_details returns the correct version.""" |
| 70 response = self.call_api('details') | 71 response = self.call_api('details') |
| 71 self.assertEqual({'server_version': utils.get_app_version()}, response.json) | 72 self.assertEqual({ |
| 73 'server_version': utils.get_app_version(), |
| 74 'bot_version': bot_code.get_bot_version('https://testbed.example.com'), |
| 75 }, response.json) |
| 72 | 76 |
| 73 def test_public_permissions(self): | 77 def test_public_permissions(self): |
| 74 """Asserts that permissions respond correctly to an unauthed user.""" | 78 """Asserts that permissions respond correctly to an unauthed user.""" |
| 75 self.set_as_anonymous() | 79 self.set_as_anonymous() |
| 76 response = self.call_api('permissions') | 80 response = self.call_api('permissions') |
| 77 expected = { | 81 expected = { |
| 78 u'cancel_task': False, | 82 u'cancel_task': False, |
| 79 u'terminate_bot': False, | 83 u'terminate_bot': False, |
| 80 u'delete_bot': False, | 84 u'delete_bot': False, |
| 81 u'get_configs': False, | 85 u'get_configs': False, |
| (...skipping 1921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2003 self.assertEqual(expected, response.json) | 2007 self.assertEqual(expected, response.json) |
| 2004 | 2008 |
| 2005 | 2009 |
| 2006 if __name__ == '__main__': | 2010 if __name__ == '__main__': |
| 2007 if '-v' in sys.argv: | 2011 if '-v' in sys.argv: |
| 2008 unittest.TestCase.maxDiff = None | 2012 unittest.TestCase.maxDiff = None |
| 2009 logging.basicConfig(level=logging.DEBUG) | 2013 logging.basicConfig(level=logging.DEBUG) |
| 2010 else: | 2014 else: |
| 2011 logging.basicConfig(level=logging.CRITICAL) | 2015 logging.basicConfig(level=logging.CRITICAL) |
| 2012 unittest.main() | 2016 unittest.main() |
| OLD | NEW |