From d5c26f871b7ee81e7bc6cc17cfddc9d08befe971 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Thu, 16 Apr 2020 11:57:40 +0200 Subject: [PATCH] [lldb/unittests] Better error messages when creating sockets fails We get failures in SocketTestUtilities on the pre-merge bots. This might give us a clue as to what's wrong. --- lldb/unittests/Host/SocketTestUtilities.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lldb/unittests/Host/SocketTestUtilities.cpp b/lldb/unittests/Host/SocketTestUtilities.cpp index 858d64f9..ab88353 100644 --- a/lldb/unittests/Host/SocketTestUtilities.cpp +++ b/lldb/unittests/Host/SocketTestUtilities.cpp @@ -33,10 +33,10 @@ void lldb_private::CreateConnectedSockets( Status error; std::unique_ptr listen_socket_up( new SocketType(true, child_processes_inherit)); - EXPECT_FALSE(error.Fail()); + ASSERT_THAT_ERROR(error.ToError(), llvm::Succeeded()); error = listen_socket_up->Listen(listen_remote_address, 5); - EXPECT_FALSE(error.Fail()); - EXPECT_TRUE(listen_socket_up->IsValid()); + ASSERT_THAT_ERROR(error.ToError(), llvm::Succeeded()); + ASSERT_TRUE(listen_socket_up->IsValid()); Status accept_error; Socket *accept_socket; @@ -47,21 +47,19 @@ void lldb_private::CreateConnectedSockets( std::string connect_remote_address = get_connect_addr(*listen_socket_up); std::unique_ptr connect_socket_up( new SocketType(true, child_processes_inherit)); - EXPECT_FALSE(error.Fail()); + ASSERT_THAT_ERROR(error.ToError(), llvm::Succeeded()); error = connect_socket_up->Connect(connect_remote_address); - EXPECT_FALSE(error.Fail()); - EXPECT_TRUE(connect_socket_up->IsValid()); + ASSERT_THAT_ERROR(error.ToError(), llvm::Succeeded()); + ASSERT_TRUE(connect_socket_up->IsValid()); a_up->swap(connect_socket_up); - EXPECT_TRUE(error.Success()); - EXPECT_NE(nullptr, a_up->get()); - EXPECT_TRUE((*a_up)->IsValid()); + ASSERT_TRUE((*a_up)->IsValid()); accept_thread.join(); b_up->reset(static_cast(accept_socket)); - EXPECT_TRUE(accept_error.Success()); - EXPECT_NE(nullptr, b_up->get()); - EXPECT_TRUE((*b_up)->IsValid()); + ASSERT_THAT_ERROR(accept_error.ToError(), llvm::Succeeded()); + ASSERT_NE(nullptr, b_up->get()); + ASSERT_TRUE((*b_up)->IsValid()); listen_socket_up.reset(); } -- 2.7.4