mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-26 08:51:25 +02:00
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From ab6163e989e93a67afb13285539fd89e60a1c11a Mon Sep 17 00:00:00 2001
|
|
From: Mike Ellery <mellery451@gmail.com>
|
|
Date: Thu, 13 Sep 2018 08:25:02 -0700
|
|
Subject: [PATCH] Remove test sensitivity to error text from OpenSSL
|
|
|
|
---
|
|
src/test/beast/beast_asio_error_test.cpp | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/test/beast/beast_asio_error_test.cpp b/src/test/beast/beast_asio_error_test.cpp
|
|
index 4a3400ea70..5aeb925cba 100644
|
|
--- a/src/test/beast/beast_asio_error_test.cpp
|
|
+++ b/src/test/beast/beast_asio_error_test.cpp
|
|
@@ -32,13 +32,14 @@ class error_test : public unit_test::suite
|
|
boost::system::error_code ec =
|
|
boost::system::error_code (335544539,
|
|
boost::asio::error::get_ssl_category ());
|
|
- std::string const s = beast::error_message_with_ssl(ec);
|
|
-
|
|
-#ifdef SSL_R_SHORT_READ
|
|
- BEAST_EXPECT(s == " (20,0,219) error:140000DB:SSL routines:SSL routines:short read");
|
|
-#else
|
|
- BEAST_EXPECT(s == " (20,0,219) error:140000DB:SSL routines:SSL routines:reason(219)");
|
|
-#endif
|
|
+ std::string s = beast::error_message_with_ssl(ec);
|
|
+ // strip away last part of the error message since
|
|
+ // it can vary with openssl versions and/or compile
|
|
+ // flags
|
|
+ auto const lastColon = s.find_last_of(':');
|
|
+ if (lastColon != s.npos)
|
|
+ s = s.substr(0, lastColon);
|
|
+ BEAST_EXPECT(s == " (20,0,219) error:140000DB:SSL routines:SSL routines");
|
|
}
|
|
}
|
|
};
|