Merge branch 'pr/121'

Change-Id: I87a3ab5ba6934e6299e4885706d4966cd6b08d28

Author: skriptble

.evergreen/config.yml

@@ -387,7 +387,7 @@ tasks:
             MONGO_GO_DRIVER_COMPRESSOR: "snappy"
 
     - name: test-standalone-auth-ssl
-      tags: ["test", "standalone"]
+      tags: ["test", "standalone", "authssl"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -401,7 +401,7 @@ tasks:
             SSL: "ssl"
 
     - name: test-standalone-auth-ssl-compression
-      tags: ["test", "standalone"]
+      tags: ["test", "standalone", "authssl", "compression"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -430,7 +430,7 @@ tasks:
             SSL: "nossl"
 
     - name: test-replicaset-noauth-nossl-compression
-      tags: ["test", "replicaset"]
+      tags: ["test", "replicaset", "compression"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -445,7 +445,7 @@ tasks:
             MONGO_GO_DRIVER_COMPRESSOR: "snappy"
 
     - name: test-replicaset-auth-ssl
-      tags: ["test", "replicaset"]
+      tags: ["test", "replicaset", "authssl"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -459,7 +459,7 @@ tasks:
             SSL: "ssl"
 
     - name: test-replicaset-auth-ssl-compression
-      tags: ["test", "replicaset"]
+      tags: ["test", "replicaset", "authssl", "compression"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -488,7 +488,7 @@ tasks:
             SSL: "nossl"
 
     - name: test-sharded-noauth-nossl-compression
-      tags: ["test", "sharded"]
+      tags: ["test", "sharded", "compression"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -503,7 +503,7 @@ tasks:
             MONGO_GO_DRIVER_COMPRESSOR: "snappy"
 
     - name: test-sharded-auth-ssl
-      tags: ["test", "sharded"]
+      tags: ["test", "sharded", "authssl"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -517,7 +517,7 @@ tasks:
             SSL: "ssl"
 
     - name: test-sharded-auth-ssl-compression
-      tags: ["test", "sharded"]
+      tags: ["test", "sharded", "authssl", "compression"]
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
@@ -613,12 +613,31 @@ axes:
         display_name: "3.2"
         variables:
            VERSION: "3.2"
+      - id: "3.0"
+        display_name: "3.0"
+        variables:
+          VERSION: "3.0"
+      - id: "2.6"
+        display_name: "2.6"
+        variables:
+          VERSION: "2.6"
       - id: "latest"
         display_name: "latest"
         variables:
            VERSION: "latest"
 
-  - id: os
+  # OSes that support versions of MongoDB >= 2.6 with SSL.
+  - id: os-ssl-legacy
+    display_name: OS
+    values:
+      - id: "ubuntu1404-go-1-11"
+        display_name: "Ubuntu 14.04"
+        run_on: ubuntu1404-test
+        variables:
+          GO_DIST: "/opt/golang/go1.11"
+
+  # OSes that require >= 3.2 for SSL
+  - id: os-ssl-32
     display_name: OS
     values:
       - id: "windows-64-go-1-11"
@@ -668,14 +687,26 @@ buildvariants:
   tasks:
     - name: ".compile-check"
 
-- matrix_name: "tests"
-  matrix_spec: { version: "*", os: "*" }
-  display_name: "${version} ${os}"
+- matrix_name: "tests-legacy-auth-ssl"
+  matrix_spec: { version: ["2.6", "3.0"], os-ssl-legacy: "*" }
+  display_name: "${version} ${os-ssl-legacy}"
+  tasks:
+    - name: ".test !.enterprise-auth !.compression"
+
+- matrix_name: "tests-legacy-noauth-nossl"
+  matrix_spec: { version: ["2.6", "3.0"], os-ssl-32: "*" }
+  display_name: "${version} ${os-ssl-32}"
+  tasks:
+    - name: ".test !.authssl !.enterprise-auth !.compression"
+
+- matrix_name: "tests-nonlegacy-servers"
+  matrix_spec: { version: ["3.2", "3.4", "3.6", "4.0", "latest"], os-ssl-32: "*" }
+  display_name: "${version} ${os-ssl-32}"
   tasks:
-     - name: ".test !.enterprise-auth"
+    - name: ".test !.enterprise-auth"
 
 - matrix_name: "enterprise-auth-tests"
-  matrix_spec: { os: "*" }
-  display_name: "Enterprise Auth - ${os}"
+  matrix_spec: { os-ssl-32: "*" }
+  display_name: "Enterprise Auth - ${os-ssl-32}"
   tasks:
      - name: ".test .enterprise-auth"

mongo/causal_consistency_test.go

@@ -179,6 +179,8 @@ func skipIfSessionsSupported(t *testing.T, db *Database) {
 }
 
 func TestCausalConsistency(t *testing.T) {
+	skipIfBelow36(t)
+
 	t.Run("TestOperationTimeNil", func(t *testing.T) {
 		// When a ClientSession is first created the operationTime has no value
 

mongo/change_stream_test.go

@@ -87,6 +87,15 @@ func createStream(t *testing.T, client *Client, dbName string, collName string,
 	return coll, stream
 }
 
+func skipIfBelow32(t *testing.T) {
+	serverVersion, err := getServerVersion(createTestDatabase(t, nil))
+	require.NoError(t, err)
+
+	if compareVersions(t, serverVersion, "3.2") < 0 {
+		t.Skip()
+	}
+}
+
 func createCollectionStream(t *testing.T, dbName string, collName string, pipeline interface{}) (*Collection, Cursor) {
 	client := createTestClient(t)
 	return createStream(t, client, dbName, collName, pipeline)

mongo/client_internal_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/mongo/writeconcern"
 	"github.com/mongodb/mongo-go-driver/x/mongo/driver/session"
 	"github.com/mongodb/mongo-go-driver/x/mongo/driver/uuid"
+	"github.com/mongodb/mongo-go-driver/x/network/connstring"
 )
 
 func createTestClient(t *testing.T) *Client {
@@ -41,6 +42,27 @@ func createTestClient(t *testing.T) *Client {
 	}
 }
 
+func createTestClientWithConnstring(t *testing.T, cs connstring.ConnString) *Client {
+	id, _ := uuid.New()
+	return &Client{
+		id:             id,
+		topology:       testutil.TopologyWithConnString(t, cs),
+		connString:     cs,
+		readPreference: readpref.Primary(),
+		clock:          &session.ClusterClock{},
+		registry:       bson.DefaultRegistry,
+	}
+}
+
+func skipIfBelow30(t *testing.T) {
+	serverVersion, err := getServerVersion(createTestDatabase(t, nil))
+	require.NoError(t, err)
+
+	if compareVersions(t, serverVersion, "3.0") < 0 {
+		t.Skip()
+	}
+}
+
 func TestNewClient(t *testing.T) {
 	t.Parallel()
 
@@ -73,6 +95,7 @@ func TestClientOptions(t *testing.T) {
 }
 
 func TestClient_TLSConnection(t *testing.T) {
+	skipIfBelow30(t) // 3.0 doesn't return a security field in the serverStatus response
 	t.Parallel()
 
 	if testing.Short() {