diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-04-20 16:52:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 16:52:13 +0000 |
| commit | 96e6718272e26d73856b48d031888d98ce30d6b4 (patch) | |
| tree | ee139412c8cb647ef9914e5251143c28a88d08f7 | |
| parent | e238dbb9bf1af4273da1174d5d9e3e1f04ac8e34 (diff) | |
| parent | 398ca80e661bb8da58f7ad38e1554287473904bf (diff) | |
| download | netd-96e6718272e26d73856b48d031888d98ce30d6b4.tar.gz | |
fix netd_integration_test64.NetdBinderTest#SocketDestroyLinkLocal flake am: 398ca80e66
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2549970
Change-Id: I7f6dd82677a15f1d2bfd2c62c2a45d5dc7036831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/binder_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp index c0a89215..423d3833 100644 --- a/tests/binder_test.cpp +++ b/tests/binder_test.cpp @@ -1068,7 +1068,7 @@ TEST_F(NetdBinderTest, SocketDestroyLinkLocal) { // The client sockets on sTun2 are closed, but the ones on sTun1 remain open. char buf[1024]; EXPECT_EQ(-1, read(c2, buf, sizeof(buf))); - EXPECT_EQ(ECONNABORTED, errno); + EXPECT_TRUE(errno == ECONNABORTED || errno == ECONNRESET); // The blocking read above ensures that SOCK_DESTROY has completed. EXPECT_EQ(3, write(a1, "foo", 3)); |