| commit | 112a51308f6f3c3946e5b5196b53aa710b9f1579 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Mon Jul 22 10:42:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 22 10:42:16 2024 +0000 |
| tree | b71443ff81366e0301f20c13765922b63d571b0c | |
| parent | d04a9d1068efef561d94e3edb672bc0e36fda763 [diff] | |
| parent | 443d6d53ec248b0d90271cbf5928d04f13edd41a [diff] |
Merge "Increase timeout to wait the default network is restored" into main am: 443d6d53ec Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3186063 Change-Id: I4aace222209c255a2f3e664cfc9dbef08781fb12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt b/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt index 1b709b2..4a594e6 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt
@@ -34,7 +34,7 @@ class DefaultNetworkRestoreMonitor( ctx: Context, private val notifier: RunNotifier, - private val timeoutMs: Long = 3000 + private val timeoutMs: Long = 30_000 ) { var firstFailure: Exception? = null var initialTransports = 0L @@ -56,8 +56,8 @@ it.caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) } } catch (e: AssertionError) { - firstFailure = IllegalStateException(desc.methodName + - " does not restore the default network") + firstFailure = IllegalStateException(desc.methodName + " does not restore the" + + "default network, initialTransports = $initialTransports", e) } finally { cm.unregisterNetworkCallback(cb) }