Improve the TLS intolerant server testing support added in r134129

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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/FTP/SYNC/TCP/UDP/ 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 2159 matching lines @@
                            help='Specify that https should be used.')
   option_parser.add_option('', '--cert-and-key-file', dest='cert_and_key_file',
                            help='specify the path to the file containing the '
                            'certificate and private key for the server in PEM '
                            'format')
   option_parser.add_option('', '--ocsp', dest='ocsp', default='ok',
                            help='The type of OCSP response generated for the '
                            'automatically generated certificate. One of '
                            '[ok,revoked,invalid]')
   option_parser.add_option('', '--tls-intolerant', dest='tls_intolerant',
-                           const=True, default=False, action='store_const',
-                           help='If true, TLS connections will be aborted '
-                           ' in order to test SSLv3 fallback.')
+                           default='0', type='int',
+                           help='If nonzero, certain TLS connections will be'
+                           ' aborted in order to test version fallback. 1'
+                           ' means all TLS versions will be aborted. 2 means'
+                           ' TLS 1.1 or higher will be aborted. 3 means TLS'
+                           ' 1.2 or higher will be aborted.')
   option_parser.add_option('', '--https-record-resume', dest='record_resume',
                            const=True, default=False, action='store_const',
                            help='Record resumption cache events rather than'
                            ' resuming as normal. Allows the use of the'
                            ' /ssl-session-cache request')
   option_parser.add_option('', '--ssl-client-auth', action='store_true',
                            help='Require SSL client auth on every connection.')
   option_parser.add_option('', '--ssl-client-ca', action='append', default=[],
                            help='Specify that the client certificate request '
                            'should include the CA named in the subject of '
@@ skipping 32 matching lines @@
                            dest='host',
                            help='Hostname or IP upon which the server will '
                            'listen. Client connections will also only be '
                            'allowed from this address.')
   option_parser.add_option('', '--auth-token', dest='auth_token',
                            help='Specify the auth token which should be used'
                            'in the authorization header for GData.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))