From db9ea7eca3b619736d9e60f4b1901c0c951e87f5 Mon Sep 17 00:00:00 2001 From: mpenick Date: Sat, 6 Sep 2014 20:31:03 -0700 Subject: [PATCH] Added "--wait-other-notice" to ccm bridge - Also removed std::none_of() from int. tests --- test/ccm_bridge/src/cql_ccm_bridge.cpp | 4 ++-- test/integration_tests/src/stress.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ccm_bridge/src/cql_ccm_bridge.cpp b/test/ccm_bridge/src/cql_ccm_bridge.cpp index 577717e1e..57e106cef 100644 --- a/test/ccm_bridge/src/cql_ccm_bridge.cpp +++ b/test/ccm_bridge/src/cql_ccm_bridge.cpp @@ -324,11 +324,11 @@ namespace cql { } void cql_ccm_bridge_t::start(int node) { - execute_ccm_command(boost::str(boost::format("node%1% start --wait-for-binary-proto") % node)); + execute_ccm_command(boost::str(boost::format("node%1% start --wait-other-notice --wait-for-binary-proto") % node)); } void cql_ccm_bridge_t::start(int node, const std::string& option) { - execute_ccm_command(boost::str(boost::format("node%1% start --wait-for-binary-proto --jvm_arg=%2%") % node % option)); + execute_ccm_command(boost::str(boost::format("node%1% start --wait-other-notice --wait-for-binary-proto --jvm_arg=%2%") % node % option)); } void cql_ccm_bridge_t::stop() { diff --git a/test/integration_tests/src/stress.cpp b/test/integration_tests/src/stress.cpp index f002166db..b72b40d7f 100644 --- a/test/integration_tests/src/stress.cpp +++ b/test/integration_tests/src/stress.cpp @@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(parallel_insert_and_select) } boost::wait_for_all(futures.begin(), futures.end()); - BOOST_REQUIRE(std::none_of(futures.begin(), futures.end(), is_failed)); + BOOST_REQUIRE(std::find_if(futures.begin(), futures.end(), is_failed) == futures.end()); } BOOST_AUTO_TEST_CASE(parallel_insert_and_select_with_nodes_failing) @@ -232,7 +232,7 @@ BOOST_AUTO_TEST_CASE(parallel_insert_and_select_with_nodes_failing) futures.insert(futures.begin() + 8, boost::async(boost::launch::async, boost::bind(kill_task, ccm)).share()); boost::wait_for_all(futures.begin(), futures.end()); - BOOST_REQUIRE(std::none_of(futures.begin(), futures.end(), is_failed)); + BOOST_REQUIRE(std::find_if(futures.begin(), futures.end(), is_failed) == futures.end()); } BOOST_AUTO_TEST_SUITE_END()