Polish the suite a tad.

Author: niemeyer

auth_test.go

@@ -744,7 +744,7 @@ func (s *S) TestDefaultDatabase(c *C) {
 func (s *S) TestAuthDirect(c *C) {
 	// Direct connections must work to the master and slaves.
 	for _, port := range []string{"40031", "40032", "40033"} {
-		url := fmt.Sprintf("mongodb://reader:rapadura@localhost:%s/?connect=direct", port)
+		url := fmt.Sprintf("mongodb://root:rapadura@localhost:%s/?connect=direct", port)
 		session, err := mgo.Dial(url)
 		c.Assert(err, IsNil)
 		defer session.Close()

cluster_test.go

@@ -538,6 +538,9 @@ func (s *S) TestPrimaryShutdownMonotonic(c *C) {
 	err = coll.Insert(M{"a": 1})
 	c.Assert(err, IsNil)
 
+	// Wait a bit for this to be synchronized to slaves.
+	time.Sleep(3 * time.Second)
+
 	result := &struct{ Host string }{}
 	err = session.Run("serverStatus", result)
 	c.Assert(err, IsNil)
@@ -662,6 +665,9 @@ func (s *S) TestPrimaryShutdownEventual(c *C) {
 	err = coll.Insert(M{"a": 1})
 	c.Assert(err, IsNil)
 
+	// Wait a bit for this to be synchronized to slaves.
+	time.Sleep(3 * time.Second)
+
 	// Kill the master.
 	s.Stop(master)
 
@@ -1314,6 +1320,10 @@ func (s *S) TestConnectCloseConcurrency(c *C) {
 }
 
 func (s *S) TestSelectServers(c *C) {
+	if !s.versionAtLeast(2, 2) {
+		c.Skip("read preferences introduced in 2.2")
+	}
+
 	session, err := mgo.Dial("localhost:40011")
 	c.Assert(err, IsNil)
 	defer session.Close()
@@ -1336,6 +1346,10 @@ func (s *S) TestSelectServers(c *C) {
 }
 
 func (s *S) TestSelectServersWithMongos(c *C) {
+	if !s.versionAtLeast(2, 2) {
+		c.Skip("read preferences introduced in 2.2")
+	}
+
 	session, err := mgo.Dial("localhost:40021")
 	c.Assert(err, IsNil)
 	defer session.Close()

testdb/init.js

@@ -50,12 +50,15 @@ function configShards() {
 
 function configAuth() {
     var addrs = ["127.0.0.1:40002", "127.0.0.1:40203", "127.0.0.1:40031"]
-    var ports = [40002, 40203] 
     for (var i in addrs) {
         db = new Mongo(addrs[i]).getDB("admin")
         db.addUser("root", "rapadura")
         db.auth("root", "rapadura")
-        db.addUser("reader", "rapadura", true)
+        if (db.serverBuildInfo().versionArray >= [2, 4]) {
+            db.addUser({user: "reader", pwd: "rapadura", roles: ["readAnyDatabase"]})
+        } else {
+            db.addUser("reader", "rapadura", true)
+        }
     }
 }