Avoid blowing out Travis matrix for client auth; add separate single test

.travis.yml

@@ -13,14 +13,10 @@ env:
   global:
     - GOMAXPROCS=2
   matrix:
-    - CASS=1.2.19 AUTH=false REQ_CLIENT_AUTH=true
-    - CASS=1.2.19 AUTH=false REQ_CLIENT_AUTH=false
-    - CASS=2.0.14 AUTH=false REQ_CLIENT_AUTH=true
-    - CASS=2.0.14 AUTH=false REQ_CLIENT_AUTH=false
-    - CASS=2.1.5  AUTH=false REQ_CLIENT_AUTH=true
-    - CASS=2.1.5  AUTH=true  REQ_CLIENT_AUTH=true
-    - CASS=2.1.5  AUTH=false REQ_CLIENT_AUTH=false
-    - CASS=2.1.5  AUTH=true  REQ_CLIENT_AUTH=false
+    - CASS=1.2.19 AUTH=false
+    - CASS=2.0.14 AUTH=false
+    - CASS=2.1.5  AUTH=false
+    - CASS=2.1.5  AUTH=true
 
 go:
   - 1.3

conn_test.go

@@ -59,7 +59,7 @@ func TestSSLSimple(t *testing.T) {
 	srv := NewSSLTestServer(t, defaultProto)
 	defer srv.Stop()
 
-	db, err := createTestSslCluster(srv.Address, defaultProto).CreateSession()
+	db, err := createTestSslCluster(srv.Address, defaultProto, true).CreateSession()
 	if err != nil {
 		t.Fatalf("0x%x: NewCluster: %v", defaultProto, err)
 	}
@@ -69,13 +69,27 @@ func TestSSLSimple(t *testing.T) {
 	}
 }
 
-func createTestSslCluster(hosts string, proto uint8) *ClusterConfig {
+func TestSSLSimpleNoClientCert(t *testing.T) {
+	srv := NewSSLTestServer(t, defaultProto)
+	defer srv.Stop()
+
+	db, err := createTestSslCluster(srv.Address, defaultProto, false).CreateSession()
+	if err != nil {
+		t.Fatalf("0x%x: NewCluster: %v", defaultProto, err)
+	}
+
+	if err := db.Query("void").Exec(); err != nil {
+		t.Fatalf("0x%x: %v", defaultProto, err)
+	}
+}
+
+func createTestSslCluster(hosts string, proto uint8, useClientCert bool) *ClusterConfig {
 	cluster := NewCluster(hosts)
 	sslOpts := &SslOptions{
 		CaPath:                 "testdata/pki/ca.crt",
 		EnableHostVerification: false,
 	}
-	if os.Getenv("REQ_CLIENT_AUTH") != "false" {
+	if useClientCert {
 		sslOpts.CertPath = "testdata/pki/gocql.crt"
 		sslOpts.KeyPath = "testdata/pki/gocql.key"
 	}
@@ -451,7 +465,7 @@ func TestPolicyConnPoolSSL(t *testing.T) {
 	srv := NewSSLTestServer(t, defaultProto)
 	defer srv.Stop()
 
-	cluster := createTestSslCluster(srv.Address, defaultProto)
+	cluster := createTestSslCluster(srv.Address, defaultProto, true)
 	cluster.ConnPoolType = NewRoundRobinConnPool
 
 	db, err := cluster.CreateSession()