Tests should clean up after themselves.

Author: behackett

test/test_collection.py

@@ -66,10 +66,6 @@ def tearDown(self):
  self.db = None
  self.connection = None
 
- # Try to diagnose intermittent failure in tests on Jenkins
- cx = get_connection()
- self.assertEqual(0, cx.test.test_unique_threaded.count())
-
  def test_collection(self):
  self.assertRaises(TypeError, Collection, self.db, 5)
 
@@ -1609,7 +1605,7 @@ def test_map_reduce(self):
  self.assertEqual(3, result.find_one({"_id": "cat"})["value"])
  self.assertEqual(2, result.find_one({"_id": "dog"})["value"])
  self.assertEqual(1, result.find_one({"_id": "mouse"})["value"])
- self.connection.mrtestdb.mrunittests.drop()
+ self.connection.drop_database('mrtestdb')
 
  full_result = db.test.map_reduce(map, reduce,
  out='mrunittests', full_response=True)

test/test_common.py

@@ -66,7 +66,7 @@ def test_baseobject(self):
  self.assertFalse(c.slave_okay)
  self.assertFalse(c.safe)
  self.assertEqual({}, c.get_lasterror_options())
- db = c.test
+ db = c.pymongo_test
  db.drop_collection("test")
  self.assertFalse(db.slave_okay)
  self.assertFalse(db.safe)
@@ -89,7 +89,7 @@ def test_baseobject(self):
  self.assertTrue(c.safe)
  d = {'w': 'majority', 'wtimeout': 300, 'fsync': True, 'j': True}
  self.assertEqual(d, c.get_lasterror_options())
- db = c.test
+ db = c.pymongo_test
  self.assertTrue(db.slave_okay)
  self.assertTrue(db.safe)
  self.assertEqual(d, db.get_lasterror_options())
@@ -117,7 +117,7 @@ def test_baseobject(self):
  d = {'w': 1, 'wtimeout': 300, 'fsync': True, 'j': True}
  self.assertEqual(d, c.get_lasterror_options())
  self.assertEqual(d, c.write_concern)
- db = c.test
+ db = c.pymongo_test
  self.assertTrue(db.slave_okay)
  self.assertTrue(db.safe)
  self.assertEqual(d, db.get_lasterror_options())
@@ -141,7 +141,7 @@ def test_baseobject(self):
  self.assertFalse(c.slave_okay)
  self.assertEqual({}, c.get_lasterror_options())
  self.assertEqual({}, c.write_concern)
- db = c.test
+ db = c.pymongo_test
  self.assertFalse(db.slave_okay)
  self.assertFalse(db.safe)
  self.assertEqual({}, db.get_lasterror_options())
@@ -222,7 +222,7 @@ def test_write_concern(self):
  c.write_concern = wc
  self.assertEqual(wc, c.write_concern)
 
- db = c.test
+ db = c.pymongo_test
  self.assertEqual(wc, db.write_concern)
  coll = db.test
  self.assertEqual(wc, coll.write_concern)

test/test_connection.py

@@ -243,7 +243,7 @@ def iterate():
 
  def test_disconnect(self):
  c = Connection(self.host, self.port)
- coll = c.foo.bar
+ coll = c.pymongo_test.bar
 
  c.disconnect()
  c.disconnect()
@@ -612,7 +612,7 @@ def test_auto_start_request(self):
  self.assertDifferentSock(pool)
 
  # Trigger auto_start_request
- conn.db.test.find_one()
+ conn.pymongo_test.test.find_one()
  self.assertRequestSocket(pool)
  self.assertSameSock(pool)
 

test/test_database.py

@@ -406,7 +406,7 @@ def test_authenticate_multiple(self):
  # Setup
  users_db = conn.pymongo_test
  admin_db = conn.admin
- other_db = conn.other
+ other_db = conn.pymongo_test1
  users_db.system.users.remove(safe=True)
  admin_db.system.users.remove(safe=True)
  users_db.test.remove(safe=True)

test/test_master_slave_connection.py

@@ -422,7 +422,7 @@ def test_base_object(self):
  self.assertTrue(bool(c.read_preference))
  self.assertFalse(c.safe)
  self.assertEqual({}, c.get_lasterror_options())
- db = c.test
+ db = c.pymongo_test
  self.assertFalse(db.slave_okay)
  self.assertTrue(bool(c.read_preference))
  self.assertFalse(db.safe)
@@ -445,7 +445,7 @@ def test_base_object(self):
  self.assertTrue(bool(c.read_preference))
  self.assertTrue(c.safe)
  self.assertEqual({'w': w, 'wtimeout': wtimeout}, c.get_lasterror_options())
- db = c.test
+ db = c.pymongo_test
  self.assertFalse(db.slave_okay)
  self.assertTrue(bool(c.read_preference))
  self.assertTrue(db.safe)

test/test_pooling.py

@@ -40,7 +40,7 @@ def test_request_with_fork(self):
  except ImportError:
  raise SkipTest("No multiprocessing module")
 
- coll = self.c.test.test
+ coll = self.c.pymongo_test.test
  coll.remove(safe=True)
  coll.insert({'_id': 1}, safe=True)
  coll.find_one()
@@ -122,7 +122,7 @@ def test_pool_with_fork(self):
  def loop(pipe):
  c = self.get_connection(auto_start_request=False)
  self.assertEqual(1,len(c._MongoClient__pool.sockets))
- c.test.test.find_one()
+ c.pymongo_test.test.find_one()
  self.assertEqual(1,len(c._MongoClient__pool.sockets))
  pipe.send(one(c._MongoClient__pool.sockets).sock.getsockname())
 

test/test_pooling_base.py

@@ -375,7 +375,7 @@ def test_dependent_pools(self):
  self.assert_pool_size(1)
  self.c.start_request()
  self.assert_request_without_socket()
- self.c.test.test.find_one()
+ self.c.pymongo_test.test.find_one()
  self.assert_request_with_socket()
  self.assert_pool_size(0)
  self.c.end_request()
@@ -387,7 +387,7 @@ def test_dependent_pools(self):
  self.assertTrue(t.passed, "OneOp.run() threw exception")
 
  self.assert_pool_size(1)
- self.c.test.test.find_one()
+ self.c.pymongo_test.test.find_one()
  self.assert_pool_size(1)
 
  def test_multiple_connections(self):
@@ -397,7 +397,7 @@ def test_multiple_connections(self):
  self.assertEqual(1, len(b._MongoClient__pool.sockets))
 
  a.start_request()
- a.test.test.find_one()
+ a.pymongo_test.test.find_one()
  self.assertEqual(0, len(a._MongoClient__pool.sockets))
  a.end_request()
  self.assertEqual(1, len(a._MongoClient__pool.sockets))
@@ -409,14 +409,14 @@ def test_multiple_connections(self):
  self.assertEqual(1, len(b._MongoClient__pool.sockets))
 
  b.start_request()
- b.test.test.find_one()
+ b.pymongo_test.test.find_one()
  self.assertEqual(1, len(a._MongoClient__pool.sockets))
  self.assertEqual(0, len(b._MongoClient__pool.sockets))
 
  b.end_request()
  b_sock = one(b._MongoClient__pool.sockets)
- b.test.test.find_one()
- a.test.test.find_one()
+ b.pymongo_test.test.find_one()
+ a.pymongo_test.test.find_one()
 
  self.assertEqual(b_sock,
  b._MongoClient__pool.get_socket((b.host, b.port)))

test/test_replica_set_connection.py

@@ -372,7 +372,7 @@ def iterate():
 
  def test_disconnect(self):
  c = self._get_connection()
- coll = c.foo.bar
+ coll = c.pymongo_test.bar
 
  c.disconnect()
  c.disconnect()
@@ -736,11 +736,12 @@ def test_auto_start_request(self):
  self.assertTrue(conn.in_request())
 
  # Trigger the RSC to actually start a request on primary pool
- conn.test.test.find_one()
+ conn.pymongo_test.test.find_one()
  self.assertTrue(primary_pool.in_request())
 
  # Trigger the RSC to actually start a request on secondary pool
- cursor = conn.test.test.find(read_preference=ReadPreference.SECONDARY)
+ cursor = conn.pymongo_test.test.find(
+ read_preference=ReadPreference.SECONDARY)
  try:
  cursor.next()
  except StopIteration:

test/test_threads.py

@@ -343,6 +343,7 @@ def tearDown(self):
  self.conn.admin.authenticate("admin-user", "password")
  self.conn.admin.system.users.remove({})
  self.conn.auth_test.system.users.remove({})
+ self.conn.drop_database('auth_test')
  # Clear connection reference so that RSC's monitor thread
  # dies.
  self.conn = None