make replication tests more reliable

Author: erh

src/mongo/dbtests/replsettests.cpp

@@ -124,7 +124,7 @@ namespace ReplSetTests {
     public:
         Base() {
             cmdLine._replSet = "foo";
-            cmdLine.oplogSize = 5;
+            cmdLine.oplogSize = 5 * 1024 * 1024;
             createOplog();
             setup();
         }
@@ -291,6 +291,8 @@ namespace ReplSetTests {
 
             dropDB->stopIndexBuilds(dbname, cmdObj);
 
+            sleepsecs(1);
+
             ASSERT(t1.finished());
             ASSERT(t2.finished());
             ASSERT(!t3.finished());
@@ -335,6 +337,8 @@ namespace ReplSetTests {
             BSONObj cmdObj = BSON("drop" << coll);
             drop->stopIndexBuilds(dbname, cmdObj);
 
+            sleepsecs(1);
+
             ASSERT(t1.finished());
             ASSERT(t2.finished());
             ASSERT(!t3.finished());
@@ -372,6 +376,8 @@ namespace ReplSetTests {
 
             c->stopIndexBuilds(dbname, cmd1);
 
+            sleepsecs(1);
+
             ASSERT(t1.finished());
             ASSERT(t2.finished());
             ASSERT(t3.finished());
@@ -404,6 +410,8 @@ namespace ReplSetTests {
 
             c->stopIndexBuilds(dbname, cmd2);
 
+            sleepsecs(1);
+
             ASSERT(!t1.finished());
             ASSERT(t2.finished());
             ASSERT(!t3.finished());
@@ -438,6 +446,8 @@ namespace ReplSetTests {
 
             c->stopIndexBuilds(dbname, cmd3);
 
+            sleepsecs(1);
+
             ASSERT(!t1.finished());
             ASSERT(!t2.finished());
             ASSERT(t3.finished());
@@ -584,6 +594,8 @@ namespace ReplSetTests {
 
             c->stopIndexBuilds(dbname, cmdObj);
 
+            sleepsecs(1);
+
             ASSERT(t1.finished());
             ASSERT(!t2.finished());
 
@@ -681,6 +693,8 @@ namespace ReplSetTests {
 
             std::vector<BSONObj> indexes = c->stopIndexBuilds(dbname, cmdObj);
 
+            sleepsecs(1);
+
             ASSERT(t1.finished());
             ASSERT(t2.finished());
             ASSERT(!t3.finished());

src/mongo/dbtests/repltests.cpp

@@ -33,6 +33,7 @@
 
 namespace mongo {
     void createOplog();
+    void oldRepl();
 }
 
 namespace ReplTests {
@@ -46,6 +47,9 @@ namespace ReplTests {
         Client::Context _context;
     public:
         Base() : _context( ns() ) {
+            oldRepl();
+            cmdLine._replSet = "";
+            cmdLine.oplogSize = 5 * 1024 * 1024;
             replSettings.master = true;
             createOplog();
             ensureHaveIdIndex( ns(), false );