Age | Commit message (Collapse) | Author |
|
am: 7de829dfae
* commit '7de829dfae22e9be8aa973a721d59c48d7f6fe7d':
Add core-oj to the list of core library jars.
|
|
|
|
(cherry picked from commit 4a373829b099ba8aab9c4b88c25cd0391b5051dc)
Change-Id: If53e3a22a7be03a7c51137d62f9511db0c1f4401
|
|
Change-Id: Ie94b2db80b981080b9fada1f0e604edc458de4c3
|
|
* commit '7f9280b5b6ff3532ef27d4f938aa2e6bbc895473':
Add throttling support to MockWebServer
|
|
* commit 'd5e25502a3ed333011753d5f2e1484072a7f5617':
Add throttling support to MockWebServer
|
|
This adds non-blocking throttling support to MockWebServer.
Most of the changes are patched across from OkHttp's version
(minus SPDY changes).
The motivation is to make an upstream OkHttp change easier
to apply, but having fewer differences with the OkHttp version
should be beneficial.
Bug: 18083851
(cherry picked from commit d8f241c21b3e2e8f94648040b1b62d7b12491d4d)
Change-Id: I7e23675cf0366028392e87c851b30e7d6dddb989
|
|
|
|
This adds non-blocking throttling support to MockWebServer.
Most of the changes are patched across from OkHttp's version
(minus SPDY changes).
The motivation is to make an upstream OkHttp change easier
to apply, but having fewer differences with the OkHttp version
should be beneficial.
Bug: 18083851
Change-Id: I63367baa46897d02ca5d3fa86f3ab83712b8addf
|
|
|
|
Change-Id: I797608b4a1870d9ccfa6502bbed4d039ed371875
|
|
|
|
Bug: 14298175
Change-Id: I5e491bbebeffda594f233b0c21b8096070ca0f3c
|
|
|
|
Bug: 13751317
Change-Id: I83d0da0e28af956339ea3a6c22ba2bd1b68ff200
|
|
|
|
There is a long comment in MockWebServer detailing the reason.
This is to fix a flaky test that was issuing two requests in
quick succession and getting unexpected results.
Change-Id: I9af3f7f83fafc72002d874dd251fdf5a1df5d487
|
|
|
|
Change-Id: I0af908d04cc5ca0a7c2ddc1d3b7f1e0a8b28548a
|
|
* commit 'e44762f71ed6eeb718a0bb6f3848beb7696fd97d':
Add new socket mode DISCONNECT_AFTER_READING_REQUEST
|
|
Useful for writing tests related to POST requests with
retryable and unretryable bodies.
(cherry picked from 3088bcc1d22f3e163e5e7ecbc997daadfdaaeec3)
bug: 10211309
Change-Id: Icb042d5875c4651348103be4eed7a2e248449b52
|
|
* commit 'cb8ab9cb9f5da083e7390920f0f7d0c8a879cb6b':
Add bookkeeping requests to the request queue.
|
|
|
|
Useful for writing tests related to POST requests with
retryable and unretryable bodies.
Change-Id: Icb042d5875c4651348103be4eed7a2e248449b52
|
|
We'd never add requests which corresponded to
DISCONNECT_AT_START and FAIL_HANDSHAKE to the list of
received requests. This allows tests to determine whether
fallback requests were made or not.
While we're here, tidy up RecordedRequest#toString. It would
return "null" for bookkeeping requests and produce test outputs
like "expected <null> but was null".
Fixes CTS test URLConnectionTest#testSslFallback
(cherry picked from a4a53d9c9bf86165a5e2bd9ce4bcb834f09d)
bug: 10211309
Change-Id: I2ee1b523faf5c1b3387f5ca9f9ad19c0877e1ad5
|
|
|
|
We'd never add requests which corresponded to
DISCONNECT_AT_START and FAIL_HANDSHAKE to the list of
received requests. This allows tests to determine whether
fallback requests were made or not.
While we're here, tidy up RecordedRequest#toString. It would
return "null" for bookkeeping requests and produce test outputs
like "expected <null> but was null".
Fixes CTS test URLConnectionTest#testSslFallback
Change-Id: I2ee1b523faf5c1b3387f5ca9f9ad19c0877e1ad5
|
|
|
|
Change-Id: Ib525b71e6addec7cd83a8cde065f958b04024933
|
|
|
|
This removes the MockStreamResponse class, replacing it with the
previous MockResponse class. The MockStreamResponse class added
too much to the MockWebServer API for too little benefit: the
BaseResponse class wasn't 'public' but it was required to be public
API for callers to call MockWebServer.enqueue(). This approach is
less object-oriented, but also a lot smaller.
Change-Id: I8496fc3c4dcbfaaf6cd5e97f06d2786b49fa51e1
|
|
|
|
Change-Id: I0b6ec193ff35b25b102f3f9287a951bdc77bd7c4
|
|
|
|
Some tests rely on MockResponses being cloned as they're enqueued,
which doesn't mix well with the recent switch to using InputStream
to represent all bodies.
This change introduces a base class that handles common header
management, and two distinct flavors: MockResponse which returns to
using byte[] bodies, and MockStreamResponse which is InputStream
based. MockResponse are again cloned when enqueued, making existing
tests happy.
Bug: 8334369
Change-Id: I12b83a06d17ba82d46166c5550397a2198ce68fd
|
|
|
|
This enables testing of large files, such as those beyond the 2GB
boundary. Also switches to streaming in MTU-sized chunks.
Bug: 8209169
Change-Id: Iab6b299c13a3d67bbbaa80a9e5bc563ef6cf9302
|
|
|
|
Change-Id: I0853a728ca8ff8a5ca43f15fc83656304bc822a1
|
|
Change-Id: I8d9837325caa9679829ebaf0cb3feb9b8aa91766
|
|
Bug 6294000
MockWebServer passes null as the requestLine argument to
RecordedRequest sometimes which causes a NPE. Fix
RecordedRequest's constructor to allow for null method
and path which is parsed from the requestLine argument.
Change-Id: Ibbff001629cbc95b389bea3bebe5583a50a7223e
|
|
Add setHeader() and removeHeader() that mutate matching MockResponse
headers. Support "bytes-per-second" to throttle response rate. Split
request line into components.
Change-Id: I107baa3727ced2d7ddcc5e3cb983f5dc9341dabd
|
|
Also add an API to RecordedRequest to help differentiate between
original TLSv1 requests and SSLv3 fallback requests.
Bug: http://b/4462288
Change-Id: I31ad0e51ca4d21365e8f1d1e717f97cc94eb040e
|
|
Bug: http://b/3041920
Change-Id: I5c8cce92d68a74a18a8b2ea0f75f6b48ab3601d5
|
|
|
|
Cherry-pick of I0bdf85b8066a5799aed92bd444b7681432874a59
Change-Id: If55d25f4dc93da6746e5230284d564600071caf8
|
|
Change-Id: I0bdf85b8066a5799aed92bd444b7681432874a59
|
|
|