diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-05-01 07:10:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-01 07:10:51 +0000 |
| commit | 0162c4fc80cb3316d010254371f36ef0bc10f02a (patch) | |
| tree | 2c5fec509aad1f41f1dc55f3c42a855e75d2ae49 | |
| parent | c370cb0a230d75c24b378426e9762891b5a66c81 (diff) | |
| parent | b91dc8229ccbb444a0ee77939485556e64873890 (diff) | |
Merge "Wait for IpClient.StoppedState#enter before tests" into rvc-dev am: b91dc8229c
Change-Id: Id7fc3cefb6f1f8d902e8164dcbbc76b92c483a17
| -rw-r--r-- | tests/integration/src/android/net/ip/IpClientIntegrationTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java index 4210619..225f598 100644 --- a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java +++ b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java @@ -449,6 +449,11 @@ public class IpClientIntegrationTest { mNetworkObserverRegistry.register(mNetd); mIpc = new IpClient(mContext, mIfaceName, mCb, mNetworkObserverRegistry, mNetworkStackServiceManager, mDependencies); + // Wait for IpClient to enter its initial state. Otherwise, additional setup steps or tests + // that mock IpClient's dependencies might interact with those mocks while IpClient is + // starting. This would cause UnfinishedStubbingExceptions as mocks cannot be interacted + // with while they are being stubbed. + HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS); // Tell the IpMemoryStore immediately to answer any question about network attributes with a // null response. Otherwise, the DHCP client will wait for two seconds before starting, |