Android: renames pylib.constants.CHROME_DIR to DIR_SOURCE_ROOT.

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.
 """
 
 import BaseHTTPServer
 import json
 import logging
 import os
 import select
 import struct
 import subprocess
 import sys
 import threading
 import time
 import urlparse
 
 import constants
 import ports
 
 
 # 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')))
+    % (os.path.join(constants.DIR_SOURCE_ROOT, 'third_party'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'third_party', 'tlslite'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'third_party', 'pyftpdlib',
+                    'src'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'net', 'tools', 'testserver'),
+       os.path.join(constants.DIR_SOURCE_ROOT, '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 140 matching lines @@
       self.command_line.append(type_cmd)
     self.command_line.append('--port=%d' % self.host_port)
     # Use a pipe to get the port given by the instance of Python test server
     # if the test does not specify the port.
     if self.host_port == 0:
       (self.pipe_in, self.pipe_out) = os.pipe()
       self.command_line.append('--startup-pipe=%d' % self.pipe_out)
     self.command_line.append('--host=%s' % self.arguments['host'])
     data_dir = self.arguments['data-dir'] or 'chrome/test/data'
     if not os.path.isabs(data_dir):
-      data_dir = os.path.join(constants.CHROME_DIR, data_dir)
+      data_dir = os.path.join(constants.DIR_SOURCE_ROOT, data_dir)
     self.command_line.append('--data-dir=%s' % data_dir)
     # The following arguments are optional depending on the individual test.
     if self.arguments.has_key('log-to-console'):
       self.command_line.append('--log-to-console')
     if self.arguments.has_key('auth-token'):
       self.command_line.append('--auth-token=%s' % self.arguments['auth-token'])
     if self.arguments.has_key('https'):
       self.command_line.append('--https')
       if self.arguments.has_key('cert-and-key-file'):
         self.command_line.append('--cert-and-key-file=%s' % os.path.join(
-            constants.CHROME_DIR, self.arguments['cert-and-key-file']))
+            constants.DIR_SOURCE_ROOT, self.arguments['cert-and-key-file']))
       if self.arguments.has_key('ocsp'):
         self.command_line.append('--ocsp=%s' % self.arguments['ocsp'])
       if self.arguments.has_key('https-record-resume'):
         self.command_line.append('--https-record-resume')
       if self.arguments.has_key('ssl-client-auth'):
         self.command_line.append('--ssl-client-auth')
       if self.arguments.has_key('tls-intolerant'):
         self.command_line.append('--tls-intolerant=%s' %
                                  self.arguments['tls-intolerant'])
       if self.arguments.has_key('ssl-client-ca'):
         for ca in self.arguments['ssl-client-ca']:
           self.command_line.append('--ssl-client-ca=%s' %
-                                   os.path.join(constants.CHROME_DIR, ca))
+                                   os.path.join(constants.DIR_SOURCE_ROOT, 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 = constants.CHROME_DIR
+    command = constants.DIR_SOURCE_ROOT
     if self.arguments['server-type'] == '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:
@@ skipping 185 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