From 16c1619c5d9d7e6e9452dc8b82e505f0554d8197 Mon Sep 17 00:00:00 2001 From: Yuval Hager Date: Tue, 15 May 2018 09:36:02 -0700 Subject: [PATCH 1/3] fix client_get_streaming_test --- libs/network/test/http/client_get_streaming_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/network/test/http/client_get_streaming_test.cpp b/libs/network/test/http/client_get_streaming_test.cpp index fed26f772..021126432 100644 --- a/libs/network/test/http/client_get_streaming_test.cpp +++ b/libs/network/test/http/client_get_streaming_test.cpp @@ -26,7 +26,7 @@ struct body_handler { TYPED_TEST_CASE(HTTPClientTest, ClientTypes); TYPED_TEST(HTTPClientTest, GetStreamingTest) { - typename TypeParam::request request("http://www.boost.org"); + typename TypeParam::request request("https://www.boost.org"); typename TypeParam::response response; typename TypeParam::string_type body_string; typename TypeParam::string_type dummy_body; From adb024a9f498272b6f99918f6775fad3414d07e0 Mon Sep 17 00:00:00 2001 From: Yuval Hager Date: Wed, 16 May 2018 08:22:09 -0700 Subject: [PATCH 2/3] perform client_get_streaming_test only if SSL is enabled --- libs/network/test/http/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt index 2948d5b92..5da8283e0 100644 --- a/libs/network/test/http/CMakeLists.txt +++ b/libs/network/test/http/CMakeLists.txt @@ -38,8 +38,10 @@ if (Boost_FOUND) client_get_test client_get_different_port_test # client_get_timeout_test - client_get_ready_test - client_get_streaming_test) + client_get_ready_test) + if (OPENSSL_FOUND) + list(APPEND TESTS client_get_streaming_test) + endif() foreach ( test ${TESTS} ) add_executable(cpp-netlib-http-${test} ${test}.cpp) add_dependencies(cpp-netlib-http-${test} cppnetlib-uri From c1702e3cecce7259a37cdcd37957bdf7ef91b9ac Mon Sep 17 00:00:00 2001 From: Yuval Hager Date: Thu, 17 May 2018 08:49:28 -0700 Subject: [PATCH 3/3] test for BOOST_NETWORK_ENABLE_HTTPS for https streaming test --- libs/network/test/http/CMakeLists.txt | 6 ++---- libs/network/test/http/client_get_streaming_test.cpp | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt index 5da8283e0..2948d5b92 100644 --- a/libs/network/test/http/CMakeLists.txt +++ b/libs/network/test/http/CMakeLists.txt @@ -38,10 +38,8 @@ if (Boost_FOUND) client_get_test client_get_different_port_test # client_get_timeout_test - client_get_ready_test) - if (OPENSSL_FOUND) - list(APPEND TESTS client_get_streaming_test) - endif() + client_get_ready_test + client_get_streaming_test) foreach ( test ${TESTS} ) add_executable(cpp-netlib-http-${test} ${test}.cpp) add_dependencies(cpp-netlib-http-${test} cppnetlib-uri diff --git a/libs/network/test/http/client_get_streaming_test.cpp b/libs/network/test/http/client_get_streaming_test.cpp index 021126432..a7c426a4e 100644 --- a/libs/network/test/http/client_get_streaming_test.cpp +++ b/libs/network/test/http/client_get_streaming_test.cpp @@ -25,6 +25,7 @@ struct body_handler { TYPED_TEST_CASE(HTTPClientTest, ClientTypes); +#ifdef BOOST_NETWORK_ENABLE_HTTPS TYPED_TEST(HTTPClientTest, GetStreamingTest) { typename TypeParam::request request("https://www.boost.org"); typename TypeParam::response response; @@ -45,3 +46,4 @@ TYPED_TEST(HTTPClientTest, GetStreamingTest) { } EXPECT_EQ(dummy_body, typename TypeParam::string_type()); } +#endif