LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase a timeout that's too short

Browse Source 
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
Original-Change: https://android-review.googlesource.com/1358064
Merged-In: If0587a2a91977427a2f679a502d838fbecdd82f2
Change-Id: If0587a2a91977427a2f679a502d838fbecdd82f2
This commit is contained in:
Treehugger Robot
2020-07-09 15:35:53 +00:00
committed by Chalard Jean
parent 8742267b94
commit eb41de1d35
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View File

@@ -495,8 +495,8 @@ class NetworkAgentTest {
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.setNetworkSpecifier(StringNetworkSpecifier(name2)) .setNetworkSpecifier(StringNetworkSpecifier(name2))
.build() .build()
val callback1 = TestableNetworkCallback() val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
val callback2 = TestableNetworkCallback() val callback2 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request1, callback1) requestNetwork(request1, callback1)
requestNetwork(request2, callback2) requestNetwork(request2, callback2)
@@ -505,7 +505,7 @@ class NetworkAgentTest {
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.build() .build()
val callback = TestableNetworkCallback() val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request, callback) requestNetwork(request, callback)
// Connect the first Network // Connect the first Network
@@ -602,7 +602,7 @@ class NetworkAgentTest {
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.build() .build()
val callback1 = TestableNetworkCallback(DEFAULT_TIMEOUT_MS).also { val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS).also {
registerNetworkCallback(request1, it) registerNetworkCallback(request1, it)
} }
requestNetwork(request1, callback1) requestNetwork(request1, callback1)
@@ -612,7 +612,7 @@ class NetworkAgentTest {
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.build() .build()
val callback = TestableNetworkCallback() val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request, callback) requestNetwork(request, callback)
// Connect the network // Connect the network