From eed17f0bc18a2553f012322cb3ca3a67aa728785 Mon Sep 17 00:00:00 2001 From: arvidn Date: Mon, 23 Nov 2015 23:39:26 -0500 Subject: [PATCH] remove the cases from non-sim test that are covered by the new http_connection sim test --- simulation/test_http_connection.cpp | 2 ++ test/test_http_connection.cpp | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/simulation/test_http_connection.cpp b/simulation/test_http_connection.cpp index 0c949b67f..5a9793bf2 100644 --- a/simulation/test_http_connection.cpp +++ b/simulation/test_http_connection.cpp @@ -480,4 +480,6 @@ TORRENT_TEST(http_connection_socks_error) // TODO: test http proxy // TODO: test socks5 with password +// TODO: test SSL +// TODO: test keepalive diff --git a/test/test_http_connection.cpp b/test/test_http_connection.cpp index a69172a26..5a0b0ceb6 100644 --- a/test/test_http_connection.cpp +++ b/test/test_http_connection.cpp @@ -219,26 +219,15 @@ void run_suite(std::string const& protocol stop_web_server(); } -TORRENT_TEST(no_proxy) { run_suite("http", settings_pack::none); } -TORRENT_TEST(socks4) { run_suite("http", settings_pack::socks4); } -TORRENT_TEST(socks5) { run_suite("http", settings_pack::socks5); } -TORRENT_TEST(socks5_pw) { run_suite("http", settings_pack::socks5_pw); } TORRENT_TEST(http) { run_suite("http", settings_pack::http); } TORRENT_TEST(http_pw) { run_suite("http", settings_pack::http_pw); } #ifdef TORRENT_USE_OPENSSL TORRENT_TEST(no_proxy_ssl) { run_suite("https", settings_pack::none); } -TORRENT_TEST(socks4_ssl) { run_suite("https", settings_pack::socks4); } -TORRENT_TEST(socks5_ssl) { run_suite("https", settings_pack::socks5); } -TORRENT_TEST(socks5_pw_ssl) { run_suite("https", settings_pack::socks5_pw); } TORRENT_TEST(http_ssl) { run_suite("https", settings_pack::http); } TORRENT_TEST(http_pw_ssl) { run_suite("https", settings_pack::http_pw); } #endif // USE_OPENSSL -TORRENT_TEST(chunked_encoding) -{ - run_suite("http", settings_pack::none, flag_chunked_encoding | flag_keepalive); -} TORRENT_TEST(no_keepalive) { run_suite("http", settings_pack::none, 0);