Merge branch 'pr/127'

GODRIVER-741

Change-Id: I5f908fea4498d347d858e4e6a472806b40cf3e10

Author: skriptble

x/network/connstring/connstring.go

@@ -573,12 +573,14 @@ func (p *parser) addOption(pair string) error {
 			return fmt.Errorf("invalid value for %s: %s", key, value)
 		}
 		p.ServerSelectionTimeout = time.Duration(n) * time.Millisecond
+		p.ServerSelectionTimeoutSet = true
 	case "sockettimeoutms":
 		n, err := strconv.Atoi(value)
 		if err != nil || n < 0 {
 			return fmt.Errorf("invalid value for %s: %s", key, value)
 		}
 		p.SocketTimeout = time.Duration(n) * time.Millisecond
+		p.SocketTimeoutSet = true
 	case "ssl":
 		switch value {
 		case "true":

x/network/connstring/connstring_test.go

@@ -139,6 +139,7 @@ func TestConnectTimeout(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				require.Equal(t, test.expected, cs.ConnectTimeout)
+				require.True(t, cs.ConnectTimeoutSet)
 			}
 		})
 	}
@@ -396,6 +397,7 @@ func TestServerSelectionTimeout(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				require.Equal(t, test.expected, cs.ServerSelectionTimeout)
+				require.True(t, cs.ServerSelectionTimeoutSet)
 			}
 		})
 	}
@@ -422,6 +424,7 @@ func TestSocketTimeout(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				require.Equal(t, test.expected, cs.SocketTimeout)
+				require.True(t, cs.SocketTimeoutSet)
 			}
 		})
 	}
@@ -448,6 +451,7 @@ func TestWTimeout(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				require.Equal(t, test.expected, cs.WTimeout)
+				require.True(t, cs.WTimeoutSet)
 			}
 		})
 	}