commit cabd4c4c6ed54fcd1c5d0af9224aae4ea03be744
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 29 23:13:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 29 23:13:36 2023 +0000
tree 28aef9c028a36498c2556d741f02390b1e498dd3
parent bf6f5b576dfdd94adf262a1c45b0e06d3747fe62
parent 6109d94ec5d864af10274457d097852e09f18ee9

Merge "netd bpf - implement ingress discard based on {dstip,ifindex}" into main

tests/cts/net/src/android/net/cts/EthernetManagerTest.kt

diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
index 3146b41..b7e5205 100644
--- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
@@ -385,6 +385,9 @@
         }
         registeredCallbacks.forEach { cm.unregisterNetworkCallback(it) }
         releaseTetheredInterface()
+        // Force releaseTetheredInterface() to be processed before starting the next test by calling
+        // setEthernetEnabled(true) which always waits on a callback.
+        setEthernetEnabled(true)
     }
 
     // Setting the carrier up / down relies on TUNSETCARRIER which was added in kernel version 5.0.
@@ -635,6 +638,9 @@
             // do nothing -- the TimeoutException indicates that no interface is available for
             // tethering.
             releaseTetheredInterface()
+            // Force releaseTetheredInterface() to be processed before proceeding by calling
+            // setEthernetEnabled(true) which always waits on a callback.
+            setEthernetEnabled(true)
         }
     }