From 8fa4242d02c55ee30d40fac65881d0b60e9151fa Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 5 Mar 2014 09:37:37 -0800 Subject: [PATCH] Attempt to deflake readSendsWindowUpdate by not enforcing order of window update frames. --- .../internal/spdy/SpdyConnectionTest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java index dbaea5200..fbfb2f5ba 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java @@ -1075,14 +1075,15 @@ public final class SpdyConnectionTest { MockSpdyPeer.InFrame synStream = peer.takeFrame(); assertEquals(TYPE_HEADERS, synStream.type); for (int i = 0; i < 3; i++) { - MockSpdyPeer.InFrame windowUpdate = peer.takeFrame(); - assertEquals(TYPE_WINDOW_UPDATE, windowUpdate.type); - assertEquals(1, windowUpdate.streamId); - assertEquals(windowUpdateThreshold, windowUpdate.windowSizeIncrement); - windowUpdate = peer.takeFrame(); - assertEquals(TYPE_WINDOW_UPDATE, windowUpdate.type); - assertEquals(0, windowUpdate.streamId); // connection window update - assertEquals(windowUpdateThreshold, windowUpdate.windowSizeIncrement); + List windowUpdateStreamIds = new ArrayList(2); + for (int j = 0; j < 2; j++) { + MockSpdyPeer.InFrame windowUpdate = peer.takeFrame(); + assertEquals(TYPE_WINDOW_UPDATE, windowUpdate.type); + windowUpdateStreamIds.add(windowUpdate.streamId); + assertEquals(windowUpdateThreshold, windowUpdate.windowSizeIncrement); + } + assertTrue(windowUpdateStreamIds.contains(0)); // connection + assertTrue(windowUpdateStreamIds.contains(1)); // stream } }