commit 521ed5b92da6eb8ad121802318c740cf4f879582
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 10 02:27:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 10 02:27:05 2022 +0000
tree ae0f912415b1d33048344540075c8ba0c1c304bd
parent e027ddf90d258134f6bd785549ab57ef50c6e566
parent 5a8738e7de92b06fc769a05b7b1069849fc5bb9d

Merge "Rename DEFINE_BPF_RINGBUF to DEFINE_BPF_RINGBUF_EXT"

staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
index b84f9a6..92c83b7 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -326,7 +326,7 @@
         timeoutMs: Long = defaultTimeoutMs,
         errorMsg: String? = null,
         test: (T) -> Boolean = { true }
-    ) = pollOrThrow(timeoutMs).also {
+    ) = pollOrThrow(timeoutMs, "Did not receive ${T::class.simpleName} after ${timeoutMs}ms").also {
         if (it !is T) fail("Expected callback ${T::class.simpleName}, got $it")
         if (ANY_NETWORK !== network && it.network != network) {
             fail("Expected network $network for callback : $it")