diff options
| author | Chris Desir <cdesir@google.com> | 2024-04-17 13:18:29 -0700 |
|---|---|---|
| committer | Chris Desir <cdesir@google.com> | 2024-04-17 15:00:00 -0700 |
| commit | 7e6f10ce0ad0643f2fe5f04f566875ba32ee7101 (patch) | |
| tree | 0cdf35f58ee6482c7ce253a0d9ca4f8f6e42cb3b | |
| parent | fd207b88e7c5e024056d8ecc9b13b792b2b8ea9f (diff) | |
| download | Connectivity-7e6f10ce0ad0643f2fe5f04f566875ba32ee7101.tar.gz | |
Add safeguard against previous ethernet interfaces existing
The test EthernetManagerTest#testEnableDisableInterface_callbacks
captures the interface state changes of ethernet
interfaces that already exist instead of the test one created. Changes
the expectCallback to eventuallyExpect to account for this.
Test: atest EthernetManagerTest
Flag: TEST_ONLY
Bug: 333338569
Change-Id: Ic08444c87f93b3832c4fae1ce2f8382bbb71cb28
| -rw-r--r-- | tests/cts/net/src/android/net/cts/EthernetManagerTest.kt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt index d052551fee..6fa28128ca 100644 --- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt +++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt @@ -905,13 +905,17 @@ class EthernetManagerTest { val iface = createInterface() val listener = EthernetStateListener() addInterfaceStateListener(listener) - listener.expectCallback(iface, STATE_LINK_UP, ROLE_CLIENT) + // Uses eventuallyExpect to account for interfaces that could already exist on device + listener.eventuallyExpect(iface, STATE_LINK_UP, ROLE_CLIENT) disableInterface(iface).expectResult(iface.name) - listener.expectCallback(iface, STATE_LINK_DOWN, ROLE_CLIENT) + listener.eventuallyExpect(iface, STATE_LINK_DOWN, ROLE_CLIENT) enableInterface(iface).expectResult(iface.name) listener.expectCallback(iface, STATE_LINK_UP, ROLE_CLIENT) + + disableInterface(iface).expectResult(iface.name) + listener.expectCallback(iface, STATE_LINK_DOWN, ROLE_CLIENT) } @Test |