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

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 515353002: Ignore persisent settings on SPDY4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable SpdySessionTest.SendInitialDataOnNewSession for SPDY4. Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_unittest.cc
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index 86e503cab7ff282a88134f7da5bd3eee6565cafc..0f621e163f7b63423c0431e89fa44a531f51c0ef 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -1534,6 +1534,11 @@ TEST_P(SpdySessionTest, CancelPendingCreateStream) {
}
TEST_P(SpdySessionTest, SendInitialDataOnNewSession) {
+ // Persistent settings are not part of HTTP/2.
+ if (GetParam() == kProtoSPDY4) {
+ return;
Johnny 2014/08/29 16:03:57 We still want to run most of this test for SPDY4,
Bence 2014/08/29 20:00:28 Done.
+ }
+
session_deps_.host_resolver->set_synchronous_mode(true);
MockRead reads[] = {
@@ -1558,12 +1563,6 @@ TEST_P(SpdySessionTest, SendInitialDataOnNewSession) {
kSessionFlowControlStreamId,
kDefaultInitialRecvWindowSize - kSpdySessionInitialWindowSize));
std::vector<MockWrite> writes;
- if (GetParam() == kProtoSPDY4) {
- writes.push_back(
- MockWrite(ASYNC,
- kHttp2ConnectionHeaderPrefix,
- kHttp2ConnectionHeaderPrefixSize));
- }
writes.push_back(CreateMockWrite(*settings_frame));
if (GetParam() >= kProtoSPDY31) {
writes.push_back(CreateMockWrite(*initial_window_update));
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698