Delete a connection after it is pruned or becomes write_timeout

webrtc/p2p/base/port_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 1237 matching lines @@
   UDPPort* port1 = CreateUdpPort(kLocalAddr1);
   UDPPort* port2 = CreateUdpPort(kLocalAddr2);
   TestChannel ch1(port1);
   TestChannel ch2(port2);
   // Acquire address.
   ch1.Start();
   ch2.Start();
   ASSERT_EQ_WAIT(1, ch1.complete_count(), kTimeout);
   ASSERT_EQ_WAIT(1, ch2.complete_count(), kTimeout);
 
-  uint32_t before_created = rtc::Time();
   ch1.CreateConnection(GetCandidate(port2));
   uint32_t after_created = rtc::Time();
   Connection* conn = ch1.conn();
   ASSERT(conn != nullptr);
   // If the connection has never received anything, it will be dead after
-  // MIN_CONNECTION_LIFETIME
-  conn->UpdateState(before_created + MIN_CONNECTION_LIFETIME - 1);
-  rtc::Thread::Current()->ProcessMessages(100);
+  // MIN_CONNECTION_LIFETIME AND inactive (write_timeout).

[pthatcher1, 2015/12/30 17:12:28]

This is now testing the case that when we are after the MIN_CONNECTION_LIFETIME
and active, we don't kill the connection.  But now we no longer test the case
that when we are before the MIN_CONNECTION_LIFETIME and inactive, we don't kill
the connection.  We need to test both, right?

[honghaiz3, 2015/12/30 19:38:18]

Done.

+  conn->UpdateState(after_created + MIN_CONNECTION_LIFETIME + 1);
+  rtc::Thread::Current()->ProcessMessages(0);
   EXPECT_TRUE(ch1.conn() != nullptr);
+  conn->Prune();
   conn->UpdateState(after_created + MIN_CONNECTION_LIFETIME + 1);
   EXPECT_TRUE_WAIT(ch1.conn() == nullptr, kTimeout);
 
   // Create a connection again and receive a ping.
   ch1.CreateConnection(GetCandidate(port2));
   conn = ch1.conn();
   ASSERT(conn != nullptr);
   uint32_t before_last_receiving = rtc::Time();
   conn->ReceivedPing();
   uint32_t after_last_receiving = rtc::Time();
@@ skipping 1235 matching lines @@
   rtc::scoped_ptr<Port> tcp_port(CreateTcpPort(kLocalAddr1));
   EXPECT_TRUE(tcp_port->SupportsProtocol(TCP_PROTOCOL_NAME));
   EXPECT_TRUE(tcp_port->SupportsProtocol(SSLTCP_PROTOCOL_NAME));
   EXPECT_FALSE(tcp_port->SupportsProtocol(UDP_PROTOCOL_NAME));
 
   rtc::scoped_ptr<Port> turn_port(
       CreateTurnPort(kLocalAddr1, nat_socket_factory1(), PROTO_UDP, PROTO_UDP));
   EXPECT_TRUE(turn_port->SupportsProtocol(UDP_PROTOCOL_NAME));
   EXPECT_FALSE(turn_port->SupportsProtocol(TCP_PROTOCOL_NAME));
 }