Skip to content

fix client_get_streaming_test #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 17, 2018
Merged

fix client_get_streaming_test #840

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16c1619
fix client_get_streaming_test
yhager May 15, 2018
adb024a
perform client_get_streaming_test only if SSL is enabled
yhager May 16, 2018
c1702e3
test for BOOST_NETWORK_ENABLE_HTTPS for https streaming test
yhager May 17, 2018
a9904fa
Merge remote-tracking branch 'origin/0.13-release' into yhager/836
yhager May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libs/network/test/http/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is what I meant.

The client_get_streaming_test could have just skipped building the GetStreamingTest by checking whether the BOOST_NETWORK_ENABLE_HTTPS as a preprocessor macro. Please revert this part of the PR.

foreach ( test ${TESTS} )
add_executable(cpp-netlib-http-${test} ${test}.cpp)
add_dependencies(cpp-netlib-http-${test} cppnetlib-uri
Expand Down
2 changes: 1 addition & 1 deletion libs/network/test/http/client_get_streaming_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @yhager -- we probably want to only build this particular test now if we've enabled HTTPS support. Can you try making this whole test conditional on whether the BOOST_NETWORK_ENABLE_HTTPS macro is defined?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be much simpler to do:

#if BOOST_NETWORK_ENABLE_HTTPS
TYPED_TEST(HTTPClientTest, GetStreamingTest) {
...
}
#endif

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Pushed the change you requested. Sorry for misunderstanding what you meant.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, thanks!

typename TypeParam::response response;
typename TypeParam::string_type body_string;
typename TypeParam::string_type dummy_body;
Expand Down