Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: net/websockets/websocket_end_to_end_test.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // End-to-end tests for WebSocket. 5 // End-to-end tests for WebSocket.
6 // 6 //
7 // A python server is (re)started for each test, which is moderately 7 // A python server is (re)started for each test, which is moderately
8 // inefficient. However, it makes these tests a good fit for scenarios which 8 // inefficient. However, it makes these tests a good fit for scenarios which
9 // require special server configurations. 9 // require special server configurations.
10 10
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 } 358 }
359 359
360 GURL ws_url = ws_server.GetURL(kEchoServer); 360 GURL ws_url = ws_server.GetURL(kEchoServer);
361 EXPECT_TRUE(ConnectAndWait(ws_url)); 361 EXPECT_TRUE(ConnectAndWait(ws_url));
362 const TestNetworkDelegateWithProxyInfo::ResolvedProxyInfo& info = 362 const TestNetworkDelegateWithProxyInfo::ResolvedProxyInfo& info =
363 network_delegate_->resolved_proxy_info(); 363 network_delegate_->resolved_proxy_info();
364 EXPECT_EQ(ws_url, info.url); 364 EXPECT_EQ(ws_url, info.url);
365 EXPECT_TRUE(info.proxy_info.is_http()); 365 EXPECT_TRUE(info.proxy_info.is_http());
366 } 366 }
367 367
368 // This is a regression test for crbug.com/408061 Crash in
369 // net::WebSocketBasicHandshakeStream::Upgrade.
370 TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(TruncatedResponse)) {
371 SpawnedTestServer ws_server(SpawnedTestServer::TYPE_WS,
372 SpawnedTestServer::kLocalhost,
373 GetWebSocketTestDataDirectory());
374 ASSERT_TRUE(ws_server.Start());
375 InitialiseContext();
376
377 GURL ws_url = ws_server.GetURL("truncated-headers");
378 EXPECT_FALSE(ConnectAndWait(ws_url));
379 }
380
368 } // namespace 381 } // namespace
369 382
370 } // namespace net 383 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_basic_handshake_stream.cc ('k') | net/websockets/websocket_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698