Fix PerfdataWriterConnection test-cases on parallel build

Author: jschmidt-icinga

test/perfdata-perfdatatargetfixture.hpp

@@ -39,16 +39,24 @@ class PerfdataWriterTargetFixture
 	explicit PerfdataWriterTargetFixture(AsioTlsOrTcpStream stream)
 		: m_Stream(std::move(stream)),
 		  m_Acceptor(
-			  IoEngine::Get().GetIoContext(),
-			  boost::asio::ip::tcp::endpoint{boost::asio::ip::address_v4::loopback(), 0}
+			  IoEngine::Get().GetIoContext()
 		  )
 	{
+		boost::asio::ip::tcp::endpoint ep{boost::asio::ip::address_v4::loopback(), 0};
+		m_Acceptor.open(ep.protocol());
+		m_Acceptor.bind(ep);
 	}
 
 	unsigned short GetPort() { return m_Acceptor.local_endpoint().port(); }
 
+	void Listen()
+	{
+		m_Acceptor.listen();
+	}
+
 	void Accept()
 	{
+		Listen();
 		BOOST_REQUIRE_NO_THROW(
 			std::visit([&](auto& stream) { return m_Acceptor.accept(stream->lowest_layer()); }, m_Stream)
 		);
@@ -63,11 +71,20 @@ class PerfdataWriterTargetFixture
 		BOOST_REQUIRE(stream->next_layer().IsVerifyOK());
 	}
 
-	void Shutdown()
+	void Shutdown(bool wait = false)
 	{
 		BOOST_REQUIRE(std::holds_alternative<Shared<AsioTlsStream>::Ptr>(m_Stream));
 		auto& stream = std::get<Shared<AsioTlsStream>::Ptr>(m_Stream);
 		try {
+			if (wait) {
+				std::array<std::byte, 128> buf{};
+				boost::asio::mutable_buffer readBuf (buf.data(), buf.size());
+				boost::system::error_code ec;
+
+				do {
+					stream->read_some(readBuf, ec);
+				} while (!ec);
+			}
 			stream->next_layer().shutdown();
 		} catch (const std::exception& ex) {
 			if (const auto* se = dynamic_cast<const boost::system::system_error*>(&ex);

test/perfdata-perfdatawriterconnection.cpp

@@ -130,10 +130,9 @@ BOOST_AUTO_TEST_CASE(finish_during_timeout)
  */
 BOOST_AUTO_TEST_CASE(stuck_in_handshake)
 {
-	TestThread mockTargetThread{[&]() { Accept(); }};
-
 	std::promise<void> p;
 	TestThread timeoutThread{[&]() {
+		Accept();
 		auto f = p.get_future();
 		GetConnection().CancelAfterTimeout(f, 50ms);
 		BOOST_REQUIRE(f.wait_for(0ms) == std::future_status::timeout);
@@ -144,7 +143,6 @@ BOOST_AUTO_TEST_CASE(stuck_in_handshake)
 	);
 
 	REQUIRE_JOINS_WITHIN(timeoutThread, 1s);
-	REQUIRE_JOINS_WITHIN(mockTargetThread, 1s);
 }
 
 /* When the disconnect timeout runs out while sending something to a slow or blocking server, we