[pkg-nagios-changes] [Git][nagios-team/icinga2][master] 2 commits: Update pr10780-parallel-unit-test.patch with additional changes.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / icinga2


Commits:
dc1dd5ce by Bas Couwenberg at 2026-04-23T11:17:05+02:00
Update pr10780-parallel-unit-test.patch with additional changes.

- - - - -
8c1abb6b by Bas Couwenberg at 2026-04-23T11:17:15+02:00
Set distribution to experimental.

- - - - -


2 changed files:

- debian/changelog
- debian/patches/pr10780-parallel-unit-test.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+icinga2 (2.16.0-3~exp2) experimental; urgency=medium
+
+  * Update pr10780-parallel-unit-test.patch with additional changes.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 23 Apr 2026 11:17:07 +0200
+
 icinga2 (2.16.0-3~exp1) experimental; urgency=medium
 
   * Add upstream patch to improve unit tests.


=====================================
debian/patches/pr10780-parallel-unit-test.patch
=====================================
@@ -110,6 +110,15 @@ Bug: https://github.com/Icinga/icinga2/issues/10811
  }
  
  /* This simulates a server that is stuck after receiving a HTTP request and before sending their
+@@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE(stuck_reading_respo
+ 		requestReadPromise.set_value();
+ 		// Do not send a response but react to the shutdown to be polite.
+ 		shutdownPromise.get_future().get();
+-		Shutdown();
++		Shutdown(true);
+ 	}};
+ 
+ 	TestThread timeoutThread{[&]() {
 @@ -226,8 +226,8 @@ BOOST_AUTO_TEST_CASE(stuck_reading_respo
  	BOOST_REQUIRE_THROW(GetConnection().Send(request), PerfdataWriterConnection::Stopped);
  	shutdownPromise.set_value();
@@ -187,3 +196,27 @@ Bug: https://github.com/Icinga/icinga2/issues/10811
  		return;
  	}
  
+--- a/test/perfdata-perfdatatargetfixture.hpp
++++ b/test/perfdata-perfdatatargetfixture.hpp
+@@ -71,11 +71,20 @@ public:
+ 		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);



View it on GitLab: https://salsa.debian.org/nagios-team/icinga2/-/compare/8033aff2eee431661e9484c36598aa5432bba41c...8c1abb6b54cf101bf68ed9828facadbf88d70c54

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/icinga2/-/compare/8033aff2eee431661e9484c36598aa5432bba41c...8c1abb6b54cf101bf68ed9828facadbf88d70c54
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20260423/384734ea/attachment-0001.htm>