summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2023-04-20 20:38:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-20 20:38:23 +0000
commit08ef1b1d6bb0538bbdd708d415a6136872a4b029 (patch)
tree1fb0f961df9eba385b4c55ed7a713902625acfd2
parent588d3d36a85ae1795954e40007308aeff85b4cff (diff)
parent3b6c6a62e797cbb21860ac6fc49e4da9c012d0a3 (diff)
downloadnetd-08ef1b1d6bb0538bbdd708d415a6136872a4b029.tar.gz
better error on failure am: 8c18fcafee am: bb142ad149 am: 3b6c6a62e7
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2552810 Change-Id: I282f9d42a97be293199f97b3171fc64d1300ab8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tests/binder_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index 423d3833..c85de3ae 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -1068,13 +1068,13 @@ 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_TRUE(errno == ECONNABORTED || errno == ECONNRESET);
+ EXPECT_TRUE(errno == ECONNABORTED || errno == ECONNRESET) << "errno:" << errno;
// The blocking read above ensures that SOCK_DESTROY has completed.
EXPECT_EQ(3, write(a1, "foo", 3));
EXPECT_EQ(3, read(c1, buf, sizeof(buf)));
EXPECT_EQ(-1, write(a2, "foo", 3));
- EXPECT_TRUE(errno == ECONNABORTED || errno == ECONNRESET);
+ EXPECT_TRUE(errno == ECONNABORTED || errno == ECONNRESET) << "errno:" << errno;
// Check the server sockets too.
EXPECT_EQ(-1, accept(s1, nullptr, 0));