aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwilson <jwilson@squareup.com>2015-05-18 19:55:48 -0400
committerNeil Fuller <nfuller@google.com>2015-05-28 16:07:39 +0100
commite9689138ba98723f93ddf1bc74bbf66d332dfd76 (patch)
tree4903799774b820d0c32fe88eee0bc07222d76da1
parentc2db2e2556ceb34c47fb32ad33b9ffc9a1db18f7 (diff)
downloadokhttp-e9689138ba98723f93ddf1bc74bbf66d332dfd76.tar.gz
Fix flaky test Spdy3ConnectionTest.receiveGoAway().
Closes https://github.com/square/okhttp/issues/1660 (cherry-picked from upstream submit 7f6df401808d904d7065b4e83c8c4c4399079d8a) Bug: 21212159 Change-Id: Iabb917e90076c851ed10fcac379298f2e6f6558c
-rw-r--r--okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java
index 40bf8c0..959f1e9 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java
@@ -709,15 +709,14 @@ public final class Spdy3ConnectionTest {
assertEquals(2, ping.payload1);
}
-
@Test public void receiveGoAway() throws Exception {
peer.setVariantAndClient(SPDY3, false);
// write the mocking script
peer.acceptFrame(); // SYN_STREAM 1
peer.acceptFrame(); // SYN_STREAM 3
+ peer.acceptFrame(); // PING.
peer.sendFrame().goAway(1, PROTOCOL_ERROR, Util.EMPTY_BYTE_ARRAY);
- peer.acceptFrame(); // PING
peer.sendFrame().ping(true, 1, 0);
peer.acceptFrame(); // DATA STREAM 1
peer.play();