From 85056a65959ae7dfe303dd17207923737f4d2e0b Mon Sep 17 00:00:00 2001 From: Håvard Pettersen Date: Fri, 14 Sep 2018 09:55:24 +0000 Subject: disable fnet tests using tls --- fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp | 10 +++++----- fnet/src/tests/frt/rpc/CMakeLists.txt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'fnet') diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp index 31aec84afd5..59ca9d4ccc0 100644 --- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp +++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp @@ -119,7 +119,7 @@ void perform_test(size_t thread_id, Client &client, Result &result) { CryptoEngine::SP null_crypto = std::make_shared(); CryptoEngine::SP xor_crypto = std::make_shared(); -CryptoEngine::SP tls_crypto = std::make_shared(vespalib::test::make_tls_options_for_testing()); +// CryptoEngine::SP tls_crypto = std::make_shared(vespalib::test::make_tls_options_for_testing()); TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (no encryption)", 128, Server(null_crypto, 1), Client(null_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } @@ -127,8 +127,8 @@ TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (no en TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (xor encryption)", 128, Server(xor_crypto, 1), Client(xor_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (tls encryption)", - 128, Server(tls_crypto, 1), Client(tls_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +// TEST_MT_FFF("parallel rpc with 1/1 transport threads and 128 user threads (tls encryption)", +// 128, Server(tls_crypto, 1), Client(tls_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (no encryption)", 128, Server(null_crypto, 8), Client(null_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } @@ -136,7 +136,7 @@ TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (no en TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (xor encryption)", 128, Server(xor_crypto, 8), Client(xor_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } -TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (tls encryption)", - 128, Server(tls_crypto, 8), Client(tls_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } +// TEST_MT_FFF("parallel rpc with 8/8 transport threads and 128 user threads (tls encryption)", +// 128, Server(tls_crypto, 8), Client(tls_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); } TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt index 2bacd37686a..4c1883ee7bd 100644 --- a/fnet/src/tests/frt/rpc/CMakeLists.txt +++ b/fnet/src/tests/frt/rpc/CMakeLists.txt @@ -7,7 +7,7 @@ vespa_add_executable(fnet_invoke_test_app TEST ) vespa_add_test(NAME fnet_invoke_test_app COMMAND fnet_invoke_test_app) vespa_add_test(NAME fnet_invoke_test_app_xor COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=xor") -vespa_add_test(NAME fnet_invoke_test_app_tls COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=tls") +# vespa_add_test(NAME fnet_invoke_test_app_tls COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=tls") vespa_add_executable(fnet_detach_return_invoke_test_app TEST SOURCES detach_return_invoke.cpp @@ -23,7 +23,7 @@ vespa_add_executable(fnet_session_test_app TEST ) vespa_add_test(NAME fnet_session_test_app COMMAND fnet_session_test_app) vespa_add_test(NAME fnet_session_test_app_xor COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=xor") -vespa_add_test(NAME fnet_session_test_app_tls COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls") +# vespa_add_test(NAME fnet_session_test_app_tls COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls") vespa_add_executable(fnet_sharedblob_test_app TEST SOURCES sharedblob.cpp -- cgit v1.2.3