Commit e176afe2 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed gu_asio_test

parent fd8c195a
all: all:
tar xf galera-26.4.8.tar.gz tar xf galera-26.4.8.tar.gz
patch -Np1 -d galera-26.4.8 < galera-26.4.8-fix_certs.patch
patch -Np1 -d galera-26.4.8 < galera-26.4.8-fix_test_ssl_certificate_chain.patch
cd galera-26.4.8 && HOME=/root CK_TIMEOUT_MULTIPLIER=30 ./scripts/build.sh cd galera-26.4.8 && HOME=/root CK_TIMEOUT_MULTIPLIER=30 ./scripts/build.sh
cp galera-26.4.8/libgalera_smm.so /usr/lib cp galera-26.4.8/libgalera_smm.so /usr/lib
rm -rf galera-26.4.8 rm -rf galera-26.4.8
This diff is collapsed.
diff -uNr galera-26.4.8/galerautils/src/gu_asio.cpp galera-26.4.8-fix_test_ssl_certificate_chain/galerautils/src/gu_asio.cpp
--- galera-26.4.8/galerautils/src/gu_asio.cpp 2021-04-08 15:35:44.000000000 +0930
+++ galera-26.4.8-fix_test_ssl_certificate_chain/galerautils/src/gu_asio.cpp 2024-04-20 17:50:03.402012015 +0930
@@ -695,6 +695,11 @@
impl_->native().run_one();
}
+void gu::AsioIoService::poll_one()
+{
+ impl_->native().poll_one();
+}
+
void gu::AsioIoService::run()
{
impl_->native().run();
diff -uNr galera-26.4.8/galerautils/src/gu_asio.hpp galera-26.4.8-fix_test_ssl_certificate_chain/galerautils/src/gu_asio.hpp
--- galera-26.4.8/galerautils/src/gu_asio.hpp 2021-04-08 15:35:44.000000000 +0930
+++ galera-26.4.8-fix_test_ssl_certificate_chain/galerautils/src/gu_asio.hpp 2024-04-20 17:49:09.115121259 +0930
@@ -662,6 +662,12 @@
void run_one();
/**
+ * Run at most one IO service handler, return immediately
+ * if no handlers are ready to run.
+ */
+ void poll_one();
+
+ /**
* Run until IO service is stopped or runs out of work.
*/
void run();
diff -uNr galera-26.4.8/galerautils/tests/gu_asio_test.cpp galera-26.4.8-fix_test_ssl_certificate_chain/galerautils/tests/gu_asio_test.cpp
--- galera-26.4.8/galerautils/tests/gu_asio_test.cpp 2021-04-08 15:35:44.000000000 +0930
+++ galera-26.4.8-fix_test_ssl_certificate_chain/galerautils/tests/gu_asio_test.cpp 2024-04-20 18:00:41.053982236 +0930
@@ -1174,8 +1174,13 @@
client_io_service.run_one(); // Process async connect
server_io_service.run_one(); // Accept
client_io_service.run_one(); // Client hello
- server_io_service.run_one(); // Server handles
- ck_assert(acceptor_handler->accepted_socket() != 0);
+ client_io_service.run_one(); // Client hello IO completion
+ // server_io_service.run_one(); // Server handles
+ while (acceptor_handler->accepted_socket() != 0)
+ {
+ client_io_service.poll_one();
+ server_io_service.poll_one();
+ }
}
END_TEST
@@ -1201,7 +1206,13 @@
client_io_service.run_one(); // Process async connect
server_io_service.run_one(); // Accept
client_io_service.run_one(); // Client hello
- server_io_service.run_one(); // Server handles
+ client_io_service.run_one(); // Client hello IO completion
+ // server_io_service.run_one(); // Server handles
+ while (not handler->last_error_code())
+ {
+ client_io_service.poll_one();
+ server_io_service.poll_one();
+ }
ck_assert(not acceptor_handler->accepted_socket());
ck_assert_msg(handler->last_error_code().message().find(
"unable to get local issuer certificate") !=
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment