Increase STUN RTOs

webrtc/p2p/base/stunrequest_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 37 matching lines @@
   static StunMessage* CreateStunMessage(StunMessageType type,
                                         StunMessage* req) {
     StunMessage* msg = new StunMessage();
     msg->SetType(type);
     if (req) {
       msg->SetTransactionID(req->transaction_id());
     }
     return msg;
   }
   static int TotalDelay(int sends) {
-    int total = 0;
-    for (int i = 0; i < sends; i++) {
-      if (i < 4)
-        total += 100 << i;
-      else
-        total += 1600;
-    }
-    return total;
+    std::vector<int> delays = {0,    250,   750,   1750,  3750,
+                               7750, 15750, 23750, 31750, 39750};
+    return delays[sends];
   }
 
   StunRequestManager manager_;
   int request_count_;
   StunMessage* response_;
   bool success_;
   bool failure_;
   bool timeout_;
 };
 
@@ skipping 59 matching lines @@
   StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, NULL);
   EXPECT_FALSE(manager_.CheckResponse(res));
 
   EXPECT_TRUE(response_ == NULL);
   EXPECT_FALSE(success_);
   EXPECT_FALSE(failure_);
   EXPECT_FALSE(timeout_);
   delete res;
 }
 
-// Test that requests are sent at the right times, and that the 9th request
-// (sent at 7900 ms) can be properly replied to.
+// Test that requests are sent at the right times.
 TEST_F(StunRequestTest, TestBackoff) {
-  const int MAX_TIMEOUT_MS = 10000;
   rtc::ScopedFakeClock fake_clock;
   StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL);
 
   int64_t start = rtc::TimeMillis();
   manager_.Send(new StunRequestThunker(req, this));
   StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, req);
   for (int i = 0; i < 9; ++i) {
-    EXPECT_TRUE_SIMULATED_WAIT(request_count_ != i, MAX_TIMEOUT_MS, fake_clock);
+    EXPECT_TRUE_SIMULATED_WAIT(request_count_ != i, STUN_TOTAL_TIMEOUT,
+                               fake_clock);
     int64_t elapsed = rtc::TimeMillis() - start;
     LOG(LS_INFO) << "STUN request #" << (i + 1)
                  << " sent at " << elapsed << " ms";
     EXPECT_EQ(TotalDelay(i), elapsed);
   }
   EXPECT_TRUE(manager_.CheckResponse(res));
 
   EXPECT_TRUE(response_ == res);
   EXPECT_TRUE(success_);
   EXPECT_FALSE(failure_);
   EXPECT_FALSE(timeout_);
   delete res;
 }
 
-// Test that we timeout properly if no response is received in 9500 ms.
+// Test that we timeout properly if no response is received.
 TEST_F(StunRequestTest, TestTimeout) {
   rtc::ScopedFakeClock fake_clock;
   StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL);
   StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, req);
 
   manager_.Send(new StunRequestThunker(req, this));
-  // Simulate the 9500 ms STUN timeout
-  SIMULATED_WAIT(false, 9500, fake_clock);
+  SIMULATED_WAIT(false, cricket::STUN_TOTAL_TIMEOUT, fake_clock);
 
   EXPECT_FALSE(manager_.CheckResponse(res));
   EXPECT_TRUE(response_ == NULL);
   EXPECT_FALSE(success_);
   EXPECT_FALSE(failure_);
   EXPECT_TRUE(timeout_);
   delete res;
 }
 
 // Regression test for specific crash where we receive a response with the
 // same id as a request that doesn't have an underlying StunMessage yet.
 TEST_F(StunRequestTest, TestNoEmptyRequest) {
   StunRequestThunker* request = new StunRequestThunker(this);
 
   manager_.SendDelayed(request, 100);
 
   StunMessage dummy_req;
   dummy_req.SetTransactionID(request->id());
   StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, &dummy_req);
 
   EXPECT_TRUE(manager_.CheckResponse(res));
 
   EXPECT_TRUE(response_ == res);
   EXPECT_TRUE(success_);
   EXPECT_FALSE(failure_);
   EXPECT_FALSE(timeout_);
   delete res;
 }