Repository: thrift Updated Branches: refs/heads/master 400d02c75 -> e2e5e22c1
THRIFT-3308: Fix broken test cases for 0.9.3 release candidate client: build Patch: jfarrell Fix broken test cases, make check now passes with all files in dist Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/e2e5e22c Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/e2e5e22c Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/e2e5e22c Branch: refs/heads/master Commit: e2e5e22c1183a81fc101e4f2e6c13b7ebd41bc8e Parents: 400d02c Author: jfarrell <[email protected]> Authored: Tue Aug 25 14:59:40 2015 -0400 Committer: jfarrell <[email protected]> Committed: Tue Aug 25 14:59:40 2015 -0400 ---------------------------------------------------------------------- .gitignore | 1 + lib/cpp/src/thrift/transport/TPipe.cpp | 4 ++-- lib/cpp/src/thrift/transport/TPipe.h | 4 ++-- lib/cpp/test/Makefile.am | 5 ++++- lib/cpp/test/TPipeInterruptTest.cpp | 5 ++++- lib/cpp/test/TPipedTransportTest.cpp | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/e2e5e22c/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index ac6253a..4219468 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ test-driver /lib/c_glib/test/testapplicationexception /lib/c_glib/test/testbinaryprotocol /lib/c_glib/test/testbufferedtransport +/lib/c_glib/test/testcontainertest /lib/c_glib/test/testdebugproto /lib/c_glib/test/testframedtransport /lib/c_glib/test/testmemorybuffer http://git-wip-us.apache.org/repos/asf/thrift/blob/e2e5e22c/lib/cpp/src/thrift/transport/TPipe.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TPipe.cpp b/lib/cpp/src/thrift/transport/TPipe.cpp index cd114c2..b1e1b72 100644 --- a/lib/cpp/src/thrift/transport/TPipe.cpp +++ b/lib/cpp/src/thrift/transport/TPipe.cpp @@ -385,11 +385,11 @@ HANDLE TPipe::getNativeWaitHandle() { return INVALID_HANDLE_VALUE; } -long TPipe::getConnectTimeout() { +long TPipe::getConnTimeout() { return TimeoutSeconds_; } -void TPipe::setConnectTimeout(long seconds) { +void TPipe::setConnTimeout(long seconds) { TimeoutSeconds_ = seconds; } http://git-wip-us.apache.org/repos/asf/thrift/blob/e2e5e22c/lib/cpp/src/thrift/transport/TPipe.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TPipe.h b/lib/cpp/src/thrift/transport/TPipe.h index 83ed9c7..fdb17ee 100644 --- a/lib/cpp/src/thrift/transport/TPipe.h +++ b/lib/cpp/src/thrift/transport/TPipe.h @@ -87,8 +87,8 @@ public: void setPipeHandle(HANDLE pipehandle); HANDLE getWrtPipeHandle(); void setWrtPipeHandle(HANDLE pipehandle); - long getConnectTimeout(); - void setConnectTimeout(long seconds); + long getConnTimeout(); + void setConnTimeout(long seconds); // this function is intended to be used in generic / template situations, // so its name needs to be the same as TPipeServer's http://git-wip-us.apache.org/repos/asf/thrift/blob/e2e5e22c/lib/cpp/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am index 435f2b5..b19f791 100755 --- a/lib/cpp/test/Makefile.am +++ b/lib/cpp/test/Makefile.am @@ -209,8 +209,11 @@ TPipedTransportTest_SOURCES = \ TPipeInterruptTest.cpp TPipedTransportTest_LDADD = \ + libtestgencpp.la \ $(top_builddir)/lib/cpp/libthrift.la \ - $(BOOST_TEST_LDADD) + $(BOOST_TEST_LDADD) \ + $(BOOST_SYSTEM_LDADD) \ + $(BOOST_THREAD_LDADD) # # AllProtocolsTest http://git-wip-us.apache.org/repos/asf/thrift/blob/e2e5e22c/lib/cpp/test/TPipeInterruptTest.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/test/TPipeInterruptTest.cpp b/lib/cpp/test/TPipeInterruptTest.cpp index b0e246d..e2f2489 100644 --- a/lib/cpp/test/TPipeInterruptTest.cpp +++ b/lib/cpp/test/TPipeInterruptTest.cpp @@ -17,6 +17,8 @@ * under the License. */ +#ifdef _WIN32 + #include <boost/test/test_tools.hpp> #include <boost/test/unit_test_suite.hpp> @@ -74,7 +76,7 @@ BOOST_AUTO_TEST_CASE(stress_pipe_accept_interruption) { for (;;) { TPipe client("TPipeInterruptTest"); - client.setConnectTimeout(1); + client.setConnTimeout(1); client.open(); } } catch (...) { /*just testing for crashes*/ } @@ -84,3 +86,4 @@ BOOST_AUTO_TEST_CASE(stress_pipe_accept_interruption) { } BOOST_AUTO_TEST_SUITE_END() +#endif http://git-wip-us.apache.org/repos/asf/thrift/blob/e2e5e22c/lib/cpp/test/TPipedTransportTest.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/test/TPipedTransportTest.cpp b/lib/cpp/test/TPipedTransportTest.cpp index a2ec81e..3221fb9 100644 --- a/lib/cpp/test/TPipedTransportTest.cpp +++ b/lib/cpp/test/TPipedTransportTest.cpp @@ -28,7 +28,7 @@ using apache::thrift::transport::TTransportException; using apache::thrift::transport::TPipedTransport; using apache::thrift::transport::TMemoryBuffer; -BOOST_AUTO_TEST_CASE(test_tpipedtransport_1) { +BOOST_AUTO_TEST_CASE(test_read_write) { boost::shared_ptr<TMemoryBuffer> underlying(new TMemoryBuffer); boost::shared_ptr<TMemoryBuffer> pipe(new TMemoryBuffer); boost::shared_ptr<TPipedTransport> trans(new TPipedTransport(underlying, pipe));
