From b7f471ae33cf1eb67e9e03902e90d172e701ceb1 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 8 Jul 2020 20:52:36 +0900 Subject: [PATCH] Increase a timeout that's too short MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should have been longer to start with. This oversight is due to a poor API in TestNetworkCallback that was made that way for backwards compatibility ; b/157405399 tracks improving this API. Test: this Bug: 160660082 Change-Id: If0587a2a91977427a2f679a502d838fbecdd82f2 --- tests/cts/net/src/android/net/cts/NetworkAgentTest.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt index 2824db7464..c8e1fc3ae2 100644 --- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt +++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt @@ -495,8 +495,8 @@ class NetworkAgentTest { .addTransportType(NetworkCapabilities.TRANSPORT_TEST) .setNetworkSpecifier(StringNetworkSpecifier(name2)) .build() - val callback1 = TestableNetworkCallback() - val callback2 = TestableNetworkCallback() + val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) + val callback2 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) requestNetwork(request1, callback1) requestNetwork(request2, callback2) @@ -505,7 +505,7 @@ class NetworkAgentTest { .clearCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_TEST) .build() - val callback = TestableNetworkCallback() + val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) requestNetwork(request, callback) // Connect the first Network @@ -602,7 +602,7 @@ class NetworkAgentTest { .clearCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_TEST) .build() - val callback1 = TestableNetworkCallback(DEFAULT_TIMEOUT_MS).also { + val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS).also { registerNetworkCallback(request1, it) } requestNetwork(request1, callback1) @@ -612,7 +612,7 @@ class NetworkAgentTest { .clearCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_TEST) .build() - val callback = TestableNetworkCallback() + val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) requestNetwork(request, callback) // Connect the network