Skip to content

Commit b8ba0bd

Browse files
committed
Fix a few tests with really old mongos versions.
1 parent 797f946 commit b8ba0bd

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

test/test_bulk.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -892,10 +892,13 @@ def setUp(self):
892892
ismaster = client.test.command('ismaster')
893893
self.is_repl = bool(ismaster.get('setName'))
894894
self.w = len(ismaster.get("hosts", []))
895+
self.client = client
895896
self.coll = client.pymongo_test.test
896897
self.coll.remove()
897898

898899
def test_fsync_and_j(self):
900+
if not version.at_least(self.client, (1, 8, 2)):
901+
raise SkipTest("Need at least MongoDB 1.8.2")
899902
batch = self.coll.initialize_ordered_bulk_op()
900903
batch.insert({'a': 1})
901904
self.assertRaises(

test/test_collection.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,8 +1307,9 @@ def test_last_error_options(self):
13071307
self.fail("WTimeoutError was not raised")
13081308

13091309
# can't use fsync and j options together
1310-
self.assertRaises(OperationFailure, self.db.test.insert,
1311-
{"_id": 1}, j=True, fsync=True)
1310+
if version.at_least(self.client, (1, 8, 2)):
1311+
self.assertRaises(OperationFailure, self.db.test.insert,
1312+
{"_id": 1}, j=True, fsync=True)
13121313

13131314
def test_manual_last_error(self):
13141315
self.db.test.save({"x": 1}, w=0)

test/test_database.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,8 +932,8 @@ def test_command_read_pref_warning(self):
932932
self.assertRaises(UserWarning, self.client.pymongo_test.command,
933933
'ping', read_preference=ReadPreference.SECONDARY)
934934
try:
935-
self.client.pymongo_test.command(
936-
'dbStats', read_preference=ReadPreference.SECONDARY)
935+
self.client.pymongo_test.command('dbStats',
936+
read_preference=ReadPreference.SECONDARY_PREFERRED)
937937
except UserWarning:
938938
self.fail("Shouldn't have raised UserWarning.")
939939

0 commit comments

Comments
 (0)