diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2015-04-17 13:19:13 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-04-22 13:27:44 -0400 |
| commit | 0031d937741fa474086fe8924c407fae2dd2f066 (patch) | |
| tree | a2790655defd9a996a0d06b2aaae5caef1a9c326 | |
| parent | 2366756e21aa4ef2d8c05502a5fe934f779ae2ff (diff) | |
| download | mongo-0031d937741fa474086fe8924c407fae2dd2f066.tar.gz | |
SERVER-18073 Make smoke.py work with pymongo 3.0
(cherry picked from commit a47efdc68977bd38161ebf91cf9b727612a6c9f3)
| -rwxr-xr-x | buildscripts/smoke.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index a806f2d0c88..ebde0d14aed 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -50,8 +50,9 @@ import time import threading import traceback -from pymongo import Connection +from pymongo import MongoClient from pymongo.errors import OperationFailure +from pymongo import ReadPreference import cleanbb import smoke @@ -267,7 +268,8 @@ class mongod(NullMongod): 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 @@ -344,7 +346,7 @@ class mongod(NullMongod): def wait_for_repl(self): print "Awaiting replicated (w:2, wtimeout:5min) insert (port:" + str(self.port) + ")" - Connection(port=self.port).testing.smokeWait.insert({}, w=2, wtimeout=5*60*1000) + MongoClient(port=self.port).testing.smokeWait.insert({}, w=2, wtimeout=5*60*1000) print "Replicated write completed -- done wait_for_repl" class Bug(Exception): @@ -379,7 +381,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 @@ -392,8 +395,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}, @@ -728,7 +732,7 @@ def run_tests(tests): use_ssl=use_ssl, use_x509=use_x509) slave.start() - 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}, @@ -744,7 +748,8 @@ def run_tests(tests): time.sleep(.2) secondaryUp = False - sConn = Connection(port=slave.port, slave_okay=True); + sConn = MongoClient(port=slave.port, + read_preference=ReadPreference.SECONDARY_PREFERRED); while not secondaryUp: result = sConn.admin.command("ismaster"); secondaryUp = result["secondary"] |