[sync] Divorce python sync test server chromiumsync.py from testserver.py

build/android/pylib/chrome_test_server_spawner.py

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A "Test Server Spawner" that handles killing/stopping per-test test servers.
 
 It's used to accept requests from the device to spawn and kill instances of the
 chrome test server on the host.
 """
 
 import BaseHTTPServer
 import json
 import logging
 import os
 import select
 import struct
 import subprocess
 import threading
 import time
 import urlparse
 
 import constants
 from forwarder import Forwarder
 import ports
 
 
-# Path that are needed to import necessary modules when running testserver.py.
-os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + ':%s:%s:%s:%s' % (
-    os.path.join(constants.CHROME_DIR, 'third_party'),
-    os.path.join(constants.CHROME_DIR, 'third_party', 'tlslite'),
-    os.path.join(constants.CHROME_DIR, 'third_party', 'pyftpdlib', 'src'),
-    os.path.join(constants.CHROME_DIR, 'net', 'tools', 'testserver'))
+# Path that are needed to import necessary modules when launching a testserver.
+os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + (':%s:%s:%s:%s:%s'
+    % (os.path.join(constants.CHROME_DIR, 'third_party'),
+       os.path.join(constants.CHROME_DIR, 'third_party', 'tlslite'),
+       os.path.join(constants.CHROME_DIR, 'third_party', 'pyftpdlib', 'src'),
+       os.path.join(constants.CHROME_DIR, 'net', 'tools', 'testserver'),
+       os.path.join(constants.CHROME_DIR, 'sync', 'tools', 'testserver')))
 
 
 SERVER_TYPES = {
     'http': '',
     'ftp': '-f',
-    'sync': '--sync',
+    'sync': '',  # Sync uses its own script, and doesn't take a server type arg.
     'tcpecho': '--tcp-echo',
     'udpecho': '--udp-echo',
 }
 
 
 # The timeout (in seconds) of starting up the Python test server.
 TEST_SERVER_STARTUP_TIMEOUT = 10
 
 
 def _CheckPortStatus(port, expected_status):
@@ skipping 151 matching lines @@
           self.command_line.append('--ssl-client-ca=%s' %
                                    os.path.join(constants.CHROME_DIR, ca))
       if self.arguments.has_key('ssl-bulk-cipher'):
         for bulk_cipher in self.arguments['ssl-bulk-cipher']:
           self.command_line.append('--ssl-bulk-cipher=%s' % bulk_cipher)
 
   def run(self):
     logging.info('Start running the thread!')
     self.wait_event.clear()
     self._GenerateCommandLineArguments()
-    command = [os.path.join(constants.CHROME_DIR, 'net', 'tools',
-                            'testserver', 'testserver.py')] + self.command_line
+    # The sync testserver is started by launching the sync_testserver.py script

[Paweł Hajdan Jr., 2013/01/17 23:38:49]

nit: The comment merely re-iterates the code. Nuke it.

[Raghu Simha, 2013/01/18 02:17:09]

Done.

+    # from sync/tools/testserver. All other testservers are started by launching
+    # the testserver.py script from net/tools/testserver.
+    command = constants.CHROME_DIR
+    if self.arguments['server-type'] is 'sync':
+      command = [os.path.join(command, 'sync', 'tools', 'testserver',
+                              'sync_testserver.py')] + self.command_line
+    else:
+      command = [os.path.join(command, 'net', 'tools', 'testserver',
+                              'testserver.py')] + self.command_line
     logging.info('Running: %s', command)
     self.process = subprocess.Popen(command)
     if self.process:
       if self.pipe_out:
         self.is_ready = self._WaitToStartAndGetPortFromTestServer()
       else:
         self.is_ready = _CheckPortStatus(self.host_port, True)
     if self.is_ready:
       self._test_server_forwarder = Forwarder(self.adb, self.build_type)
       self._test_server_forwarder.Run(
@@ skipping 171 matching lines @@
   def Start(self):
     listener_thread = threading.Thread(target=self._Listen)
     listener_thread.setDaemon(True)
     listener_thread.start()
     time.sleep(1)
 
   def Stop(self):
     if self.server.test_server_instance:
       self.server.test_server_instance.Stop()
     self.server.shutdown()