From f3ae4a42d223359755278f863ed222bb17672158 Mon Sep 17 00:00:00 2001 From: Wolfgang Stöggl Date: Apr 25 2020 19:19:29 +0000 Subject: New upstream version 2.10.16 - Update patch: cpprest-2.10.16-disable-outside-and-failing-tests.patch Disable new outside tests: redirect_tests:does_not_follow_https_to_http_by_default redirect_tests:can_follow_https_to_http - Remove ||: from tests again --- diff --git a/.gitignore b/.gitignore index 224810e..8585d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cpprest-2.10.13.tar.gz /cpprest-2.10.14.tar.gz /cpprest-2.10.15.tar.gz +/cpprest-2.10.16.tar.gz diff --git a/cpprest-2.10.15-disable-outside-and-failing-tests.patch b/cpprest-2.10.15-disable-outside-and-failing-tests.patch deleted file mode 100644 index 3b9e03f..0000000 --- a/cpprest-2.10.15-disable-outside-and-failing-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/Release/tests/functional/http/client/CMakeLists.txt b/Release/tests/functional/http/client/CMakeLists.txt -index 635e7da8..bdc37062 100644 ---- a/Release/tests/functional/http/client/CMakeLists.txt -+++ b/Release/tests/functional/http/client/CMakeLists.txt -@@ -12,7 +12,6 @@ set(SOURCES - multiple_requests.cpp - oauth1_tests.cpp - oauth2_tests.cpp -- outside_tests.cpp - pipeline_stage_tests.cpp - progress_handler_tests.cpp - proxy_tests.cpp -diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp -index c0440fed..afa4a666 100644 ---- a/Release/tests/functional/http/client/authentication_tests.cpp -+++ b/Release/tests/functional/http/client/authentication_tests.cpp -@@ -675,9 +675,13 @@ SUITE(authentication_tests) - VERIFY_ARE_EQUAL(return_code, response.status_code()); - } - -+/* - TEST(auth_no_data) { auth_test_impl(false); } -+*/ - -+/* - TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } -+*/ - - TEST_FIXTURE(uri_address, set_user_options_asio_http) - { -@@ -695,6 +699,7 @@ SUITE(authentication_tests) - VERIFY_ARE_EQUAL(200, response.status_code()); - } - -+/* - TEST_FIXTURE(uri_address, set_user_options_asio_https) - { - handle_timeout([] { -@@ -714,6 +719,7 @@ SUITE(authentication_tests) - VERIFY_IS_FALSE(v.empty()); - }); - } -+*/ - - #endif - -diff --git a/Release/tests/functional/http/client/connections_and_errors.cpp b/Release/tests/functional/http/client/connections_and_errors.cpp -index 847755d8..59b36b0a 100644 ---- a/Release/tests/functional/http/client/connections_and_errors.cpp -+++ b/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -408,6 +408,7 @@ SUITE(connections_and_errors) - } - #endif - -+/* - // Try to connect to a server on a closed port and cancel the operation. - TEST_FIXTURE(uri_address, cancel_bad_port) - { -@@ -439,6 +440,7 @@ SUITE(connections_and_errors) - - VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); - } -+*/ - - } // SUITE(connections_and_errors) - -diff --git a/Release/tests/functional/websockets/client/authentication_tests.cpp b/Release/tests/functional/websockets/client/authentication_tests.cpp -index a35949c9..7a3fd753 100644 ---- a/Release/tests/functional/websockets/client/authentication_tests.cpp -+++ b/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -93,6 +93,7 @@ SUITE(authentication_tests) - return false; - } - -+/* - TEST(ssl_test) - { - websocket_client client; -@@ -127,6 +128,7 @@ SUITE(authentication_tests) - throw; - } - } -+*/ - - void handshake_error_test_impl(const ::utility::string_t& host) - { -@@ -148,11 +150,17 @@ SUITE(authentication_tests) - } - } - -+/* - TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } -+*/ - -+/* - TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } -+*/ - -+/* - TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } -+*/ - - } // SUITE(authentication_tests) - diff --git a/cpprest-2.10.16-disable-outside-and-failing-tests.patch b/cpprest-2.10.16-disable-outside-and-failing-tests.patch new file mode 100644 index 0000000..f6f4db4 --- /dev/null +++ b/cpprest-2.10.16-disable-outside-and-failing-tests.patch @@ -0,0 +1,124 @@ +diff --git a/Release/tests/functional/http/client/CMakeLists.txt b/Release/tests/functional/http/client/CMakeLists.txt +index 3e1a9363..06726bef 100644 +--- a/Release/tests/functional/http/client/CMakeLists.txt ++++ b/Release/tests/functional/http/client/CMakeLists.txt +@@ -12,7 +12,6 @@ set(SOURCES + multiple_requests.cpp + oauth1_tests.cpp + oauth2_tests.cpp +- outside_tests.cpp + pipeline_stage_tests.cpp + progress_handler_tests.cpp + proxy_tests.cpp +diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp +index c0440fed..afa4a666 100644 +--- a/Release/tests/functional/http/client/authentication_tests.cpp ++++ b/Release/tests/functional/http/client/authentication_tests.cpp +@@ -675,9 +675,13 @@ SUITE(authentication_tests) + VERIFY_ARE_EQUAL(return_code, response.status_code()); + } + ++/* + TEST(auth_no_data) { auth_test_impl(false); } ++*/ + ++/* + TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } ++*/ + + TEST_FIXTURE(uri_address, set_user_options_asio_http) + { +@@ -695,6 +699,7 @@ SUITE(authentication_tests) + VERIFY_ARE_EQUAL(200, response.status_code()); + } + ++/* + TEST_FIXTURE(uri_address, set_user_options_asio_https) + { + handle_timeout([] { +@@ -714,6 +719,7 @@ SUITE(authentication_tests) + VERIFY_IS_FALSE(v.empty()); + }); + } ++*/ + + #endif + +diff --git a/Release/tests/functional/http/client/connections_and_errors.cpp b/Release/tests/functional/http/client/connections_and_errors.cpp +index 847755d8..59b36b0a 100644 +--- a/Release/tests/functional/http/client/connections_and_errors.cpp ++++ b/Release/tests/functional/http/client/connections_and_errors.cpp +@@ -408,6 +408,7 @@ SUITE(connections_and_errors) + } + #endif + ++/* + // Try to connect to a server on a closed port and cancel the operation. + TEST_FIXTURE(uri_address, cancel_bad_port) + { +@@ -439,6 +440,7 @@ SUITE(connections_and_errors) + + VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); + } ++*/ + + } // SUITE(connections_and_errors) + +diff --git a/Release/tests/functional/http/client/redirect_tests.cpp b/Release/tests/functional/http/client/redirect_tests.cpp +index a9d41794..2fb2adcc 100644 +--- a/Release/tests/functional/http/client/redirect_tests.cpp ++++ b/Release/tests/functional/http/client/redirect_tests.cpp +@@ -160,6 +160,7 @@ SUITE(redirect_tests) + } + } + ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,6 +183,7 @@ SUITE(redirect_tests) + ); + }); + } ++*/ + + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { +diff --git a/Release/tests/functional/websockets/client/authentication_tests.cpp b/Release/tests/functional/websockets/client/authentication_tests.cpp +index a35949c9..7a3fd753 100644 +--- a/Release/tests/functional/websockets/client/authentication_tests.cpp ++++ b/Release/tests/functional/websockets/client/authentication_tests.cpp +@@ -93,6 +93,7 @@ SUITE(authentication_tests) + return false; + } + ++/* + TEST(ssl_test) + { + websocket_client client; +@@ -127,6 +128,7 @@ SUITE(authentication_tests) + throw; + } + } ++*/ + + void handshake_error_test_impl(const ::utility::string_t& host) + { +@@ -148,11 +150,17 @@ SUITE(authentication_tests) + } + } + ++/* + TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } ++*/ + ++/* + TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } ++*/ + ++/* + TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } ++*/ + + } // SUITE(authentication_tests) + diff --git a/cpprest.spec b/cpprest.spec index cfd1c39..b09611b 100644 --- a/cpprest.spec +++ b/cpprest.spec @@ -1,14 +1,14 @@ %define major 2 %define minor 10 Name: cpprest -Version: 2.10.15 +Version: 2.10.16 Release: 1%{?dist} Summary: C++ REST library License: MIT Url: https://github.com/Microsoft/cpprestsdk Source0: https://github.com/Microsoft/cpprestsdk/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Disable outside, failing and sometimes failing tests -Patch1: cpprest-2.10.15-disable-outside-and-failing-tests.patch +Patch1: cpprest-2.10.16-disable-outside-and-failing-tests.patch # Disable tests with long timeouts Patch2: cpprest-2.10.9-disable-tests-long-timeouts.patch # Disable test extract_floating_point, which fails on ppc64le and aarch64 @@ -73,7 +73,7 @@ cd Release/build.release %else # Run tests for the other buildArchs like x86_64, ppc64le, aarch64, i686, armv7hl cd Release/build.release/Binaries -./test_runner *_test.so ||: +./test_runner *_test.so %endif %ldconfig_scriptlets @@ -92,6 +92,14 @@ cd Release/build.release/Binaries %changelog +* Sat Apr 25 2020 Wolfgang Stöggl - 2.10.16-1 +- New upstream version 2.10.16 +- Update patch: cpprest-2.10.16-disable-outside-and-failing-tests.patch + Disable new outside tests: + redirect_tests:does_not_follow_https_to_http_by_default + redirect_tests:can_follow_https_to_http +- Remove ||: from tests again + * Mon Feb 24 2020 Wolfgang Stöggl - 2.10.15-1 - New upstream version 2.10.15 - Update patch: cpprest-2.10.15-disable-outside-and-failing-tests.patch diff --git a/sources b/sources index a7af3c2..7e4dd3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cpprest-2.10.15.tar.gz) = ef8884c9f7fde2b6a25357ef0e7ee87b473a2e3140af2c5af0e3be7776ac2e8c0da431a356892020a3c37c84e30396350e2083cd4e1192a41fd3e099e74179f7 +SHA512 (cpprest-2.10.16.tar.gz) = d850b26051439dd10edcecd006075c64c61c565193cd76870af175bd343a72ecc59485deb0f907807071a57dd256b67139ad5d016f19cb38f7142357f430be1c