Add support for --proxy_port.

devserver.py

 #!/usr/bin/python
 
 # Copyright (c) 2009-2010 The Chromium OS 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 CherryPy-based webserver to host images and build packages."""
 
 import cherrypy
 import optparse
@@ skipping 117 matching lines @@
   parser.add_option('--for_vm', dest='vm', default=False, action='store_true',
                     help='Update is for a vm image.')
   parser.add_option('--image', dest='image',
                     help='Force update using this image.')
   parser.add_option('-p', '--pregenerate_update', action='store_true',
                     default=False, help='Pre-generate update payload.')
   parser.add_option('--payload', dest='payload',
                     help='Use update payload from specified directory.')
   parser.add_option('--port', default=8080,
                     help='Port for the dev server to use.')
+  parser.add_option('--proxy_port', default=None,
+                    help='Port to have the client connect to (testing support)')
   parser.add_option('--src_image', default='',
                     help='Image on remote machine for generating delta update.')
   parser.add_option('-t', action='store_true', dest='test_image')
   parser.add_option('-u', '--urlbase', dest='urlbase',
                     help='base URL, other than devserver, for update images.')
   parser.add_option('--validate_factory_config', action="store_true",
                     dest='validate_factory_config',
                     help='Validate factory config file, then exit.')
   parser.set_usage(parser.format_help())
   (options, _) = parser.parse_args()
@@ skipping 15 matching lines @@
 
   if options.clear_cache:
     # Clear the cache and exit on error
     if os.system('sudo rm -rf %s' % cache_dir) != 0:
       cherrypy.log('Failed to clear the cache with %s' % cmd,
                    'DEVSERVER')
       sys.exit(1)
 
   if os.path.exists(cache_dir):
     # Clear all but the last N cached updates
-    cmd = ('cd %s; ls -1tr | head --lines=-%d | xargs rm -rf' %
+    cmd = ('cd %s; ls -tr | head --lines=-%d | xargs rm -rf' %
            (cache_dir, CACHED_ENTRIES))
     if os.system(cmd) != 0:
       cherrypy.log('Failed to clean up old delta cache files with %s' % cmd,
                    'DEVSERVER')
       sys.exit(1)
 
   cherrypy.log('Source root is %s' % root_dir, 'DEVSERVER')
   cherrypy.log('Serving from %s' % static_dir, 'DEVSERVER')
 
   updater = autoupdate.Autoupdate(
       root_dir=root_dir,
       static_dir=static_dir,
       serve_only=serve_only,
       urlbase=options.urlbase,
       test_image=options.test_image,
       factory_config_path=options.factory_config,
       client_prefix=options.client_prefix,
       forced_image=options.image,
       forced_payload=options.payload,
       port=options.port,
+      proxy_port=options.proxy_port,
       src_image=options.src_image,
       vm=options.vm,
       board=options.board)
 
   # Sanity-check for use of validate_factory_config.
   if not options.factory_config and options.validate_factory_config:
     parser.error('You need a factory_config to validate.')
 
   if options.factory_config:
     updater.ImportFactoryConfigFile(options.factory_config,
                                      options.validate_factory_config)
     # We don't run the dev server with this option.
     if options.validate_factory_config:
       sys.exit(0)
   elif options.pregenerate_update:
     if not updater.PreGenerateUpdate():
       sys.exit(1)
 
   # If the command line requested after setup, it's time to do it.
   if not options.exit:
     cherrypy.quickstart(DevServerRoot(), config=_GetConfig(options))