diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-04-21 14:33:12 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-04-21 21:04:33 +0000 |
commit | bbf11af22fff91b6f8f757a252ee4255bd018166 (patch) | |
tree | 7f8306230bfc0d37a7baa91589705c0cdd571a0c /vbench/src/tests | |
parent | 33390132c1249768e445d8272bbfe421c6d2a5fc (diff) |
let socket handle handle more socket stuff
very simple Socket/SimpleSocket
stop using fastos sockets in websocket experimental code
stop using fastos sockets in vbench
Diffstat (limited to 'vbench/src/tests')
-rw-r--r-- | vbench/src/tests/server_socket/.gitignore | 1 | ||||
-rw-r--r-- | vbench/src/tests/server_socket/CMakeLists.txt | 9 | ||||
-rw-r--r-- | vbench/src/tests/server_socket/FILES | 1 | ||||
-rw-r--r-- | vbench/src/tests/server_socket/server_socket_test.cpp | 24 |
4 files changed, 0 insertions, 35 deletions
diff --git a/vbench/src/tests/server_socket/.gitignore b/vbench/src/tests/server_socket/.gitignore deleted file mode 100644 index e79511c3a0a..00000000000 --- a/vbench/src/tests/server_socket/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vbench_server_socket_test_app diff --git a/vbench/src/tests/server_socket/CMakeLists.txt b/vbench/src/tests/server_socket/CMakeLists.txt deleted file mode 100644 index ac76763ae16..00000000000 --- a/vbench/src/tests/server_socket/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vbench_server_socket_test_app TEST - SOURCES - server_socket_test.cpp - DEPENDS - vbench_test - vbench -) -vespa_add_test(NAME vbench_server_socket_test_app COMMAND vbench_server_socket_test_app) diff --git a/vbench/src/tests/server_socket/FILES b/vbench/src/tests/server_socket/FILES deleted file mode 100644 index 47bee2d3769..00000000000 --- a/vbench/src/tests/server_socket/FILES +++ /dev/null @@ -1 +0,0 @@ -server_socket_test.cpp diff --git a/vbench/src/tests/server_socket/server_socket_test.cpp b/vbench/src/tests/server_socket/server_socket_test.cpp deleted file mode 100644 index 575c7dfaa02..00000000000 --- a/vbench/src/tests/server_socket/server_socket_test.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/testapp.h> -#include <vbench/test/all.h> -#include <vespa/vespalib/util/thread.h> - -using namespace vbench; - -TEST_MT_F("require that close will interrupt accept", 2, ServerSocket()) { - if (thread_id == 0) { - for (;;) { - Stream::UP stream = f1.accept(); - if (stream.get() == 0) { - break; - } - } - Stream::UP s2 = f1.accept(); - EXPECT_TRUE(s2.get() == 0); - } else { - vespalib::Thread::sleep(20); - f1.close(); - } -} - -TEST_MAIN() { TEST_RUN_ALL(); } |