[Sync] //components/sync external changes [DO NOT SUBMIT]

build/android/pylib/chrome_test_server_spawner.py

 # 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.
 """
 # pylint: disable=W0702
@@ skipping 17 matching lines @@
 from pylib.constants import host_paths
 
 
 # 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(host_paths.DIR_SOURCE_ROOT, 'third_party'),
        os.path.join(host_paths.DIR_SOURCE_ROOT, 'third_party', 'tlslite'),
        os.path.join(host_paths.DIR_SOURCE_ROOT, 'third_party', 'pyftpdlib',
                     'src'),
        os.path.join(host_paths.DIR_SOURCE_ROOT, 'net', 'tools', 'testserver'),
-       os.path.join(host_paths.DIR_SOURCE_ROOT, 'sync', 'tools', 'testserver')))
+       os.path.join(host_paths.DIR_SOURCE_ROOT, 'components', 'sync', 'tools',
+                    'testserver')))
 
 
 SERVER_TYPES = {
     'http': '',
     'ftp': '-f',
     'sync': '',  # Sync uses its own script, and doesn't take a server type arg.
     'tcpecho': '--tcp-echo',
     'udpecho': '--udp-echo',
 }
 
@@ skipping 163 matching lines @@
           os.close(fd)
         except:
           pass
 
   def run(self):
     logging.info('Start running the thread!')
     self.wait_event.clear()
     self._GenerateCommandLineArguments()
     command = host_paths.DIR_SOURCE_ROOT
     if self.arguments['server-type'] == 'sync':
-      command = [os.path.join(command, 'sync', 'tools', 'testserver',
+      command = [os.path.join(command, 'components', '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)
 
     # Disable PYTHONUNBUFFERED because it has a bad interaction with the
     # testserver. Remove once this interaction is fixed.
     unbuf = os.environ.pop('PYTHONUNBUFFERED', None)
 
@@ skipping 188 matching lines @@
 
   def CleanupState(self):
     """Cleans up the spawning server state.
 
     This should be called if the test server spawner is reused,
     to avoid sharing the test server instance.
     """
     if self.server.test_server_instance:
       self.server.test_server_instance.Stop()
       self.server.test_server_instance = None