SERVER-18073 Make smoke.py work with pymongo 3.0

1 files changed, 13 insertions, 7 deletions

diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index c1edb88ebe2..dabbbfd6ab3 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -47,8 +47,9 @@ from subprocess import (PIPE, Popen, STDOUT)
 import sys
 import time
 
-from pymongo import Connection
+from pymongo import MongoClient
 from pymongo.errors import OperationFailure
+from pymongo import ReadPreference
 
 import cleanbb
 import utils
@@ -241,7 +242,8 @@ class mongod(object):
             raise Exception("Failed to start mongod")
 
         if self.slave:
-            local = Connection(port=self.port, slave_okay=True).local
+            local = MongoClient(port=self.port,
+                read_preference=ReadPreference.SECONDARY_PREFERRED).local
             synced = False
             while not synced:
                 synced = True
@@ -308,7 +310,9 @@ class mongod(object):
         sys.stdout.flush()
 
     def wait_for_repl(self):
-        Connection(port=self.port).testing.smokeWait.insert({}, w=2, wtimeout=5*60*1000)
+        print "Awaiting replicated (w:2, wtimeout:5min) insert (port:" + str(self.port) + ")"
+        MongoClient(port=self.port).testing.smokeWait.insert({}, w=2, wtimeout=5*60*1000)
+        print "Replicated write completed -- done wait_for_repl"
 
 class Bug(Exception):
     def __str__(self):
@@ -344,7 +348,8 @@ def check_db_hashes(master, slave):
 
     # FIXME: maybe make this run dbhash on all databases?
     for mongod in [master, slave]:
-        mongod.dbhash = Connection(port=mongod.port, slave_okay=True).test.command("dbhash")
+        client = MongoClient(port=mongod.port, read_preference=ReadPreference.SECONDARY_PREFERRED)
+        mongod.dbhash = client.test.command("dbhash")
         mongod.dict = mongod.dbhash["collections"]
 
     global lost_in_slave, lost_in_master, screwy_in_slave, replicated_collections
@@ -357,8 +362,9 @@ def check_db_hashes(master, slave):
         mhash = master.dict[coll]
         shash = slave.dict[coll]
         if mhash != shash:
-            mTestDB = Connection(port=master.port, slave_okay=True).test
-            sTestDB = Connection(port=slave.port, slave_okay=True).test
+            mTestDB = MongoClient(port=master.port).test
+            sTestDB = MongoClient(port=slave.port,
+                read_preference=ReadPreference.SECONDARY_PREFERRED).test
             mCount = mTestDB[coll].count()
             sCount = sTestDB[coll].count()
             stats = {'hashes': {'master': mhash, 'slave': shash},
@@ -660,7 +666,7 @@ def run_tests(tests):
                            keyFile=keyFile,
                            use_ssl=use_ssl,
                            use_x509=use_x509).__enter__()
-            primary = Connection(port=master.port, slave_okay=True);
+            primary = MongoClient(port=master.port);
 
             primary.admin.command({'replSetInitiate' : {'_id' : 'foo', 'members' : [
                             {'_id': 0, 'host':'localhost:%s' % master.port},