Silence testserver logs when tests are run in non-verbose mode

net/tools/testserver/testserver.py

 #!/usr/bin/python2.4
 # Copyright (c) 2011 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.
 
 """This is a simple HTTP server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
 the originating process over a pipe. The originating process can specify an
@@ skipping 1371 matching lines @@
   def write(self, text) :
     self.__fd1.write(text)
     self.__fd2.write(text)
 
   def flush(self) :
     self.__fd1.flush()
     self.__fd2.flush()
 
 def main(options, args):
   logfile = open('testserver.log', 'w')
-  sys.stdout = FileMultiplexer(sys.stdout, logfile)
   sys.stderr = FileMultiplexer(sys.stderr, logfile)
+  if options.log_to_console:
+    sys.stdout = FileMultiplexer(sys.stdout, logfile)
+  else:
+    sys.stdout = logfile
 
   port = options.port
 
   server_data = {}
 
   if options.server_type == SERVER_HTTP:
     if options.cert:
       # let's make sure the cert file exists.
       if not os.path.isfile(options.cert):
         print 'specified server cert file not found: ' + options.cert + \
@@ skipping 78 matching lines @@
 if __name__ == '__main__':
   option_parser = optparse.OptionParser()
   option_parser.add_option("-f", '--ftp', action='store_const',
                            const=SERVER_FTP, default=SERVER_HTTP,
                            dest='server_type',
                            help='start up an FTP server.')
   option_parser.add_option('', '--sync', action='store_const',
                            const=SERVER_SYNC, default=SERVER_HTTP,
                            dest='server_type',
                            help='start up a sync server.')
+  option_parser.add_option('', '--log-to-console', action='store_const',
+                           const=True, default=False,
+                           dest='log_to_console',
+                           help='Enables or disables sys.stdout logging to '
+                           'the console.')
   option_parser.add_option('', '--port', default='0', type='int',
                            help='Port used by the server. If unspecified, the '
                            'server will listen on an ephemeral port.')
   option_parser.add_option('', '--data-dir', dest='data_dir',
                            help='Directory from which to read the files.')
   option_parser.add_option('', '--https', dest='cert',
                            help='Specify that https should be used, specify '
                            'the path to the cert containing the private key '
                            'the server should use.')
   option_parser.add_option('', '--ssl-client-auth', action='store_true',
@@ skipping 20 matching lines @@
   option_parser.add_option('', '--policy-cert-chain', action='append',
                            help='Specify a path to a certificate file to sign '
                                 'policy responses. This option may be used '
                                 'multiple times to define a certificate chain. '
                                 'The first element will be used for signing, '
                                 'the last element should be the root '
                                 'certificate.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))