Merge pull request #306 from riptano/1.10.0_prep

1.10.0 GA release preparation

Author: mikefero

CHANGELOG.md

@@ -1,18 +1,25 @@
+1.10.0
+===========
+
+Bug Fixes
+--------
+* [CPP-819] - Ensure port is updated on already assigned contact points
+
 1.10.0-alpha2
 ===========
 
 Features
 --------
-[CPP-812] - Enable warnings for implicit casts and fix problems
-[CPP-813] - Detect CaaS and change consistency default
-[CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
-[CPP-818] - Add missing configuration elements to Insights startup message
+* [CPP-812] - Enable warnings for implicit casts and fix problems
+* [CPP-813] - Detect CaaS and change consistency default
+* [CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
+* [CPP-818] - Add missing configuration elements to Insights startup message
 
 Bug Fixes
 --------
-[CPP-802] - Handle prepared id mismatch when repreparing on the fly
-[CPP-815] - Schema agreement fails with SNI
-[CPP-811] - Requests won't complete if they exceed the number of streams on a connection
+* [CPP-802] - Handle prepared id mismatch when repreparing on the fly
+* [CPP-815] - Schema agreement fails with SNI
+* [CPP-811] - Requests won't complete if they exceed the number of streams on a connection
 
 1.10.0-alpha
 ===========

appveyor.yml

@@ -40,7 +40,7 @@ environment:
   DRIVER_TYPE: DSE
   BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
-  LIBUV_VERSION: 1.32.0
+  LIBUV_VERSION: 1.33.0
   OPENSSL_1_0_VERSION: 1.0.2s
   OPENSSL_1_1_VERSION: 1.1.1c
   ZLIB_VERSION: 1.2.11

build.yaml

@@ -35,7 +35,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.32.0
+  LIBUV_VERSION: 1.33.0
 build:
   - script: |
       . ./cpp-driver/.build.sh

cpp-driver/CHANGELOG.md

@@ -1,17 +1,24 @@
+2.14.0
+===========
+
+Bug Fixes
+--------
+* [CPP-819] - Ensure port is updated on already assigned contact points
+
 2.14.0-alpha2
 ===========
 
 Features
 --------
-[CPP-812] - Enable warnings for implicit casts and fix problems
-[CPP-813] - Detect CaaS and change consistency default
-[CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
+* [CPP-812] - Enable warnings for implicit casts and fix problems
+* [CPP-813] - Detect CaaS and change consistency default
+* [CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
 
 Bug Fixes
 --------
-[CPP-802] - Handle prepared id mismatch when repreparing on the fly
-[CPP-815] - Schema agreement fails with SNI
-[CPP-811] - Requests won't complete if they exceed the number of streams on a connection
+* [CPP-802] - Handle prepared id mismatch when repreparing on the fly
+* [CPP-815] - Schema agreement fails with SNI
+* [CPP-811] - Requests won't complete if they exceed the number of streams on a connection
 
 2.14.0-alpha
 ===========

cpp-driver/appveyor.yml

@@ -39,7 +39,7 @@ environment:
   DRIVER_TYPE: CASS
   BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
-  LIBUV_VERSION: 1.32.0
+  LIBUV_VERSION: 1.33.0
   OPENSSL_1_0_VERSION: 1.0.2s
   OPENSSL_1_1_VERSION: 1.1.1c
   ZLIB_VERSION: 1.2.11

cpp-driver/build.yaml

@@ -33,7 +33,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.32.0
+  LIBUV_VERSION: 1.33.0
 build:
   - script: |
       . .build.sh

cpp-driver/gtests/src/integration/integration.hpp

@@ -37,11 +37,13 @@
 
 // Macros for grouping tests together
 #define GROUP_TEST_F(group_name, test_case, test_name) TEST_F(test_case, group_name##_##test_name)
+#define GROUP_TEST(group_name, test_case, test_name) TEST(test_case, group_name##_##test_name)
 #define GROUP_TYPED_TEST_P(group_name, test_case, test_name) \
   TYPED_TEST_P(test_case, group_name##_##test_name)
 
 // Macros to use for grouping integration tests together
-#define GROUP_INTEGRATION_TEST(server_type) GROUP_CONCAT(Integration, server_type)
+#define INTEGRATION_TEST(server_type, test_case, test_name) \
+  GROUP_TEST(Integration##_##server_type, test_case, test_name)
 #define INTEGRATION_TEST_F(server_type, test_case, test_name) \
   GROUP_TEST_F(Integration##_##server_type, test_case, test_name)
 #define INTEGRATION_TYPED_TEST_P(server_type, test_case, test_name) \
@@ -52,7 +54,8 @@
   GROUP_TYPED_TEST_P(DISABLED##_##Integration##_##server_type, test_case, est_name)
 
 // Macros to use for grouping Cassandra integration tests together
-#define CASSANDRA_TEST_NAME(test_name) Integration##_##Cassandra##_##test_name
+#define CASSANDRA_INTEGRATION_TEST(test_case, test_name) \
+  INTEGRATION_TEST(Cassandra, test_case, test_name)
 #define CASSANDRA_INTEGRATION_TEST_F(test_case, test_name) \
   INTEGRATION_TEST_F(Cassandra, test_case, test_name)
 #define CASSANDRA_INTEGRATION_TYPED_TEST_P(test_case, test_name) \

cpp-driver/gtests/src/integration/simulacron/simulacron_integration.hpp

@@ -22,11 +22,12 @@
 #include <uv.h>
 
 // Macros to use for grouping Simulacron integration tests together
-#define SIMULACRON_TEST_NAME(test_name) Integration##_##simulacron##_##test_name
+#define SIMULACRON_INTEGRATION_TEST(test_case, test_name) \
+  INTEGRATION_TEST(Simulacron, test_case, test_name)
 #define SIMULACRON_INTEGRATION_TEST_F(test_case, test_name) \
-  INTEGRATION_TEST_F(simulacron, test_case, test_name)
+  INTEGRATION_TEST_F(Simulacron, test_case, test_name)
 #define SIMULACRON_INTEGRATION_TYPED_TEST_P(test_case, test_name) \
-  INTEGRATION_TYPED_TEST_P(simulacron, test_case, test_name)
+  INTEGRATION_TYPED_TEST_P(Simulacron, test_case, test_name)
 
 #define CHECK_SIMULACRON_AVAILABLE \
   if (!sc_) {                      \

cpp-driver/gtests/src/integration/test_category.cpp

@@ -23,7 +23,7 @@
 const TestCategory TestCategory::CASSANDRA("CASSANDRA", 0, "Cassandra", "*_Cassandra_*");
 const TestCategory TestCategory::DSE("DSE", 1, "DataStax Enterprise", "*_DSE_*");
 const TestCategory TestCategory::SIMULACRON("SIMULACRON", SHRT_MAX, "Simulated DSE (and Cassandra)",
-                                            "*_simulacron_*");
+                                            "*_Simulacron_*");
 
 // Static declarations for test type
 std::set<TestCategory> TestCategory::constants_;

cpp-driver/gtests/src/integration/tests/test_cluster.cpp

@@ -14,7 +14,14 @@
   limitations under the License.
 */
 
-#include "objects/cluster.hpp"
+#include "integration.hpp"
+
+class ClusterTests : public Integration {
+public:
+  ClusterTests() {
+    is_ccm_requested_ = false;
+  }
+};
 
 /**
  * Set local dc to null for dc-aware lbp
@@ -23,7 +30,7 @@
  * @test_category configuration
  * @expected_result Error out because it is illegal to specify a null local-dc.
  */
-TEST(ClusterTest, SetLoadBalanceDcAwareNullLocalDc) {
+CASSANDRA_INTEGRATION_TEST_F(ClusterTests, SetLoadBalanceDcAwareNullLocalDc) {
   test::driver::Cluster cluster;
   EXPECT_EQ(CASS_ERROR_LIB_BAD_PARAMS,
             cass_cluster_set_load_balance_dc_aware(cluster.get(), NULL, 99, cass_false));
@@ -36,7 +43,7 @@ TEST(ClusterTest, SetLoadBalanceDcAwareNullLocalDc) {
  * @test_category configuration
  * @expected_result CASS_ERROR_LIB_BAD_PARAMS.
  */
-TEST(ClusterTest, ExponentialReconnectionPolicyBadParameters) {
+CASSANDRA_INTEGRATION_TEST_F(ClusterTests, ExponentialReconnectionPolicyBadParameters) {
   test::driver::Cluster cluster;
 
   // Base delay must be greater than 1
@@ -54,7 +61,7 @@ TEST(ClusterTest, ExponentialReconnectionPolicyBadParameters) {
  * @test_category configuration
  * @expected_result CASS_ERROR_LIB_BAD_PARAMS.
  */
-TEST(ClusterTest, SecureConnectionBundleBadParameters) {
+CASSANDRA_INTEGRATION_TEST_F(ClusterTests, SecureConnectionBundleBadParameters) {
   test::driver::Cluster cluster;
 
   EXPECT_EQ(CASS_ERROR_LIB_BAD_PARAMS, cass_cluster_set_cloud_secure_connection_bundle_n(