Update talk to 56619788
R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/3839005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5120 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -37,9 +37,16 @@ static const char kPath[] = "/";
|
||||
static const char kHost[] = "relay.google.com";
|
||||
static const uint16 kPort = 443;
|
||||
static const bool kSecure = true;
|
||||
// Each of the two stages in AutoDetectProxy has a 2-second time-out, so 5
|
||||
// seconds total should be enough.
|
||||
static const int kTimeoutMs = 5000;
|
||||
// At most, AutoDetectProxy should take ~6 seconds. Each connect step is
|
||||
// allotted 2 seconds, with the initial resolution + connect given an
|
||||
// extra 2 seconds. The slowest case is:
|
||||
// 1) Resolution + HTTPS takes full 4 seconds and fails (but resolution
|
||||
// succeeds).
|
||||
// 2) SOCKS5 takes the full 2 seconds.
|
||||
// Socket creation time seems unbounded, and has been observed to take >1 second
|
||||
// on a linux machine under load. As such, we allow for 10 seconds for timeout,
|
||||
// though could still end up with some flakiness.
|
||||
static const int kTimeoutMs = 10000;
|
||||
|
||||
class AutoDetectProxyTest : public testing::Test, public sigslot::has_slots<> {
|
||||
public:
|
||||
|
Reference in New Issue
Block a user