| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # Copyright 2013 The Chromium Authors. All rights reserved. | 2 # Copyright 2013 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 """This is a python sync server used for testing Chrome Sync. | 6 """This is a python sync server used for testing Chrome Sync. | 
| 7 | 7 | 
| 8 By default, it listens on an ephemeral port and xmpp_port and sends the port | 8 By default, it listens on an ephemeral port and xmpp_port and sends the port | 
| 9 numbers back to the originating process over a pipe. The originating process can | 9 numbers back to the originating process over a pipe. The originating process can | 
| 10 specify an explicit port and xmpp_port if necessary. | 10 specify an explicit port and xmpp_port if necessary. | 
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 143                     self.ChromiumSyncDisableNotificationsOpHandler, | 143                     self.ChromiumSyncDisableNotificationsOpHandler, | 
| 144                     self.ChromiumSyncEnableNotificationsOpHandler, | 144                     self.ChromiumSyncEnableNotificationsOpHandler, | 
| 145                     self.ChromiumSyncSendNotificationOpHandler, | 145                     self.ChromiumSyncSendNotificationOpHandler, | 
| 146                     self.ChromiumSyncBirthdayErrorOpHandler, | 146                     self.ChromiumSyncBirthdayErrorOpHandler, | 
| 147                     self.ChromiumSyncTransientErrorOpHandler, | 147                     self.ChromiumSyncTransientErrorOpHandler, | 
| 148                     self.ChromiumSyncErrorOpHandler, | 148                     self.ChromiumSyncErrorOpHandler, | 
| 149                     self.ChromiumSyncSyncTabFaviconsOpHandler, | 149                     self.ChromiumSyncSyncTabFaviconsOpHandler, | 
| 150                     self.ChromiumSyncCreateSyncedBookmarksOpHandler, | 150                     self.ChromiumSyncCreateSyncedBookmarksOpHandler, | 
| 151                     self.ChromiumSyncEnableKeystoreEncryptionOpHandler, | 151                     self.ChromiumSyncEnableKeystoreEncryptionOpHandler, | 
| 152                     self.ChromiumSyncRotateKeystoreKeysOpHandler, | 152                     self.ChromiumSyncRotateKeystoreKeysOpHandler, | 
| 153                     self.ChromiumSyncEnableManagedUserAcknowledgementHandler] | 153                     self.ChromiumSyncEnableManagedUserAcknowledgementHandler, | 
|  | 154                     self.ChromiumSyncEnablePreCommitGetUpdateAvoidanceHandler] | 
| 154 | 155 | 
| 155     post_handlers = [self.ChromiumSyncCommandHandler, | 156     post_handlers = [self.ChromiumSyncCommandHandler, | 
| 156                      self.ChromiumSyncTimeHandler] | 157                      self.ChromiumSyncTimeHandler] | 
| 157     testserver_base.BasePageHandler.__init__(self, request, client_address, | 158     testserver_base.BasePageHandler.__init__(self, request, client_address, | 
| 158                                              sync_http_server, [], get_handlers, | 159                                              sync_http_server, [], get_handlers, | 
| 159                                              [], post_handlers, []) | 160                                              [], post_handlers, []) | 
| 160 | 161 | 
| 161 | 162 | 
| 162   def ChromiumSyncTimeHandler(self): | 163   def ChromiumSyncTimeHandler(self): | 
| 163     """Handle Chromium sync .../time requests. | 164     """Handle Chromium sync .../time requests. | 
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 420       return False | 421       return False | 
| 421     result, raw_reply = ( | 422     result, raw_reply = ( | 
| 422         self.server._sync_handler.HandleEnableManagedUserAcknowledgement()) | 423         self.server._sync_handler.HandleEnableManagedUserAcknowledgement()) | 
| 423     self.send_response(result) | 424     self.send_response(result) | 
| 424     self.send_header('Content-Type', 'text/html') | 425     self.send_header('Content-Type', 'text/html') | 
| 425     self.send_header('Content-Length', len(raw_reply)) | 426     self.send_header('Content-Length', len(raw_reply)) | 
| 426     self.end_headers() | 427     self.end_headers() | 
| 427     self.wfile.write(raw_reply) | 428     self.wfile.write(raw_reply) | 
| 428     return True | 429     return True | 
| 429 | 430 | 
|  | 431   def ChromiumSyncEnablePreCommitGetUpdateAvoidanceHandler(self): | 
|  | 432     test_name = "/chromiumsync/enableprecommitgetupdateavoidance" | 
|  | 433     if not self._ShouldHandleRequest(test_name): | 
|  | 434       return False | 
|  | 435     result, raw_reply = ( | 
|  | 436         self.server._sync_handler.HandleEnablePreCommitGetUpdateAvoidance()) | 
|  | 437     self.send_response(result) | 
|  | 438     self.send_header('Content-Type', 'text/html') | 
|  | 439     self.send_header('Content-Length', len(raw_reply)) | 
|  | 440     self.end_headers() | 
|  | 441     self.wfile.write(raw_reply) | 
|  | 442     return True | 
|  | 443 | 
| 430 class SyncServerRunner(testserver_base.TestServerRunner): | 444 class SyncServerRunner(testserver_base.TestServerRunner): | 
| 431   """TestServerRunner for the net test servers.""" | 445   """TestServerRunner for the net test servers.""" | 
| 432 | 446 | 
| 433   def __init__(self): | 447   def __init__(self): | 
| 434     super(SyncServerRunner, self).__init__() | 448     super(SyncServerRunner, self).__init__() | 
| 435 | 449 | 
| 436   def create_server(self, server_data): | 450   def create_server(self, server_data): | 
| 437     port = self.options.port | 451     port = self.options.port | 
| 438     host = self.options.host | 452     host = self.options.host | 
| 439     xmpp_port = self.options.xmpp_port | 453     xmpp_port = self.options.xmpp_port | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 451     testserver_base.TestServerRunner.add_options(self) | 465     testserver_base.TestServerRunner.add_options(self) | 
| 452     self.option_parser.add_option('--xmpp-port', default='0', type='int', | 466     self.option_parser.add_option('--xmpp-port', default='0', type='int', | 
| 453                                   help='Port used by the XMPP server. If ' | 467                                   help='Port used by the XMPP server. If ' | 
| 454                                   'unspecified, the XMPP server will listen on ' | 468                                   'unspecified, the XMPP server will listen on ' | 
| 455                                   'an ephemeral port.') | 469                                   'an ephemeral port.') | 
| 456     # Override the default logfile name used in testserver.py. | 470     # Override the default logfile name used in testserver.py. | 
| 457     self.option_parser.set_defaults(log_file='sync_testserver.log') | 471     self.option_parser.set_defaults(log_file='sync_testserver.log') | 
| 458 | 472 | 
| 459 if __name__ == '__main__': | 473 if __name__ == '__main__': | 
| 460   sys.exit(SyncServerRunner().main()) | 474   sys.exit(SyncServerRunner().main()) | 
| OLD | NEW | 
|---|