diff options
| author | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 16:54:06 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 16:54:06 +0000 |
| commit | 93423a205b4bcd274b31a43388dff21a7fc3d3b0 (patch) | |
| tree | e933fd1e6febf24494da83d9a800fe3a3a1b96f5 /build/android/pylib/chrome_test_server_spawner.py | |
| parent | 50ff26e480b41b2fc7382e5e3da45b254bb856f7 (diff) | |
| download | chromium_src-93423a205b4bcd274b31a43388dff21a7fc3d3b0.zip chromium_src-93423a205b4bcd274b31a43388dff21a7fc3d3b0.tar.gz chromium_src-93423a205b4bcd274b31a43388dff21a7fc3d3b0.tar.bz2 | |
Fix tls-intolerant handling.
The net/tools/testerver program supports an option named
--tls-intolerant=<mode> used to simulate TLS connection
aborts (which is itself used to test TLS fallback modes).
The <mode> argument is an integer specifying exactly which
types of connections to abort. For more details, read
net/tools/testserver/testerver.py.
The chrome_test_server_spawner.py was not using the option
properly (instead, just using '--tls-intolerant' without any
mode value). This patch fixes this, which allows
HTTPSRequestTest.TLSv1Fallback to pass on Android.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10916225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/chrome_test_server_spawner.py')
| -rw-r--r-- | build/android/pylib/chrome_test_server_spawner.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/android/pylib/chrome_test_server_spawner.py b/build/android/pylib/chrome_test_server_spawner.py index 0b5e4e8..133b672 100644 --- a/build/android/pylib/chrome_test_server_spawner.py +++ b/build/android/pylib/chrome_test_server_spawner.py @@ -193,7 +193,8 @@ class TestServerThread(threading.Thread): 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') + 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' % |