diff options
| author | davidben <davidben@chromium.org> | 2014-10-06 21:09:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 04:09:22 +0000 |
| commit | 9399c95f5e3f45a2f36c25b9678627049277d220 (patch) | |
| tree | 60e8ded314b6c531bc3501f2a34c6b6abea6e45b | |
| parent | ad57550b73172c8f8af4ad329be77e278f68c088 (diff) | |
| download | chromium_src-9399c95f5e3f45a2f36c25b9678627049277d220.zip chromium_src-9399c95f5e3f45a2f36c25b9678627049277d220.tar.gz chromium_src-9399c95f5e3f45a2f36c25b9678627049277d220.tar.bz2 | |
Unbreak HTTPSRequestTest.DisableECDSAOnXP.
Avoid a trailing newline in the body.
BUG=411827
Review URL: https://codereview.chromium.org/610223003
Cr-Commit-Position: refs/heads/master@{#298362}
| -rwxr-xr-x | net/tools/testserver/testserver.py | 5 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 7739902..4294414 100755 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -1536,9 +1536,8 @@ class TestPageHandler(testserver_base.BasePageHandler): self.send_header('Content-Type', 'text/plain') self.end_headers() - for cipher_suite in self.server.tlsConnection.clientHello.cipher_suites: - self.wfile.write(str(cipher_suite)) - self.wfile.write('\n') + cipher_suites = self.server.tlsConnection.clientHello.cipher_suites + self.wfile.write('\n'.join(str(c) for c in cipher_suites)) return True def CloseSocketHandler(self): diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 11c8f57..dbf858d 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -7033,8 +7033,7 @@ bool IsECDSACipherSuite(uint16_t cipher_suite) { // Test that ECDSA is disabled on Windows XP, where ECDSA certificates cannot be // verified. -// Test seems flaky, see http://crbug.com/411827. -TEST_F(HTTPSRequestTest, DISABLED_DisableECDSAOnXP) { +TEST_F(HTTPSRequestTest, DisableECDSAOnXP) { if (base::win::GetVersion() >= base::win::VERSION_VISTA) { LOG(INFO) << "Skipping test on this version."; return; |