Skip to content

Make master-slave connection unittests succeed more reliably #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2012
Merged

Make master-slave connection unittests succeed more reliably #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177bf49
Make master-slave connection tests more reliable
Jan 20, 2012
94bbd7b
Restore two useful asserts before skipping a test that fails due to S…
Jan 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions test/test_master_slave_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ def test_database_names(self):
self.assert_("pymongo_test_mike" in dbs)

def test_drop_database(self):
# This test has been known to fail due to SERVER-2329
self.assertRaises(TypeError, self.connection.drop_database, 5)
self.assertRaises(TypeError, self.connection.drop_database, None)

raise SkipTest("This test often fails due to SERVER-2329")

self.connection.pymongo_test.test.save({"dummy": u"object"}, safe=True)
dbs = self.connection.database_names()
self.assert_("pymongo_test" in dbs)
Expand Down Expand Up @@ -330,6 +331,7 @@ def test_base_object(self):
self.assertFalse(db.safe)
self.assertEqual({}, db.get_lasterror_options())
coll = db.test
coll.drop()
self.assertFalse(coll.slave_okay)
self.assertTrue(bool(c.read_preference))
self.assertFalse(coll.safe)
Expand All @@ -339,21 +341,22 @@ def test_base_object(self):
self.assertTrue(bool(cursor._Cursor__read_preference))

c.safe = True
c.set_lasterror_options(w=3, wtimeout=100)
w = 1 + len(self.slaves)
c.set_lasterror_options(w=w, wtimeout=100)
self.assertFalse(c.slave_okay)
self.assertTrue(bool(c.read_preference))
self.assertTrue(c.safe)
self.assertEqual({'w': 3, 'wtimeout': 100}, c.get_lasterror_options())
self.assertEqual({'w': w, 'wtimeout': 100}, c.get_lasterror_options())
db = c.test
self.assertFalse(db.slave_okay)
self.assertTrue(bool(c.read_preference))
self.assertTrue(db.safe)
self.assertEqual({'w': 3, 'wtimeout': 100}, db.get_lasterror_options())
self.assertEqual({'w': w, 'wtimeout': 100}, db.get_lasterror_options())
coll = db.test
self.assertFalse(coll.slave_okay)
self.assertTrue(bool(c.read_preference))
self.assertTrue(coll.safe)
self.assertEqual({'w': 3, 'wtimeout': 100},
self.assertEqual({'w': w, 'wtimeout': 100},
coll.get_lasterror_options())
cursor = coll.find()
self.assertFalse(cursor._Cursor__slave_okay)
Expand Down