Informative message whenever skipping a test

Author: A. Jesse Jiryu Davis

test/test_binary.py

@@ -94,7 +94,7 @@ def test_repr(self):
 
     def test_legacy_java_uuid(self):
         if not should_test_uuid:
-            raise SkipTest()
+            raise SkipTest("No uuid module")
 
         # Generated by the Java driver
         from_java = b('bAAAAAdfaWQAUCBQxkVm+XdxJ9tOBW5ld2d1aWQAEAAAAAMIQkfACFu'
@@ -166,7 +166,7 @@ def test_legacy_java_uuid(self):
 
     def test_legacy_csharp_uuid(self):
         if not should_test_uuid:
-            raise SkipTest()
+            raise SkipTest("No uuid module")
 
         # Generated by the .net driver
         from_csharp = b('ZAAAABBfaWQAAAAAAAVuZXdndWlkABAAAAAD+MkoCd/Jy0iYJ7Vhl'
@@ -237,7 +237,7 @@ def test_legacy_csharp_uuid(self):
 
     def test_uuid_queries(self):
         if not should_test_uuid:
-            raise SkipTest()
+            raise SkipTest("No uuid module")
 
         c = get_connection()
         coll = c.pymongo_test.test

test/test_bson.py

@@ -310,7 +310,7 @@ def test_tuple(self):
 
     def test_uuid(self):
         if not should_test_uuid:
-            raise SkipTest()
+            raise SkipTest("No uuid module")
 
         id = uuid.uuid4()
         transformed_id = (BSON.encode({"id": id})).decode()["id"]
@@ -321,7 +321,7 @@ def test_uuid(self):
 
     def test_uuid_legacy(self):
         if not should_test_uuid:
-            raise SkipTest()
+            raise SkipTest("No uuid module")
 
         id = uuid.uuid4()
         legacy = UUIDLegacy(id)
@@ -437,7 +437,7 @@ def test_ordered_dict(self):
         try:
             from collections import OrderedDict
         except ImportError:
-            raise SkipTest()
+            raise SkipTest("No OrderedDict")
         d = OrderedDict([("one", 1), ("two", 2), ("three", 3), ("four", 4)])
         self.assertEqual(d, BSON.encode(d).decode(as_class=OrderedDict))
 

test/test_collection.py

@@ -880,7 +880,7 @@ def test_duplicate_key_error(self):
     def test_continue_on_error(self):
         db = self.db
         if not version.at_least(db.connection, (1, 9, 1)):
-            raise SkipTest()
+            raise SkipTest("continue_on_error requires MongoDB >= 1.9.1")
 
         db.drop_collection("test")
         oid = db.test.insert({"one": 1})
@@ -966,7 +966,7 @@ def test_update(self):
     def test_multi_update(self):
         db = self.db
         if not version.at_least(db.connection, (1, 1, 3, -1)):
-            raise SkipTest()
+            raise SkipTest("multi-update requires MongoDB >= 1.1.3")
 
         db.drop_collection("test")
 
@@ -1060,7 +1060,7 @@ def test_safe_remove(self):
 
     def test_last_error_options(self):
         if not version.at_least(self.connection, (1, 5, 1)):
-            raise SkipTest()
+            raise SkipTest("getLastError options require MongoDB >= 1.5.1")
 
         # XXX: Fix this if we ever have a replica set unittest env.
         # mongo >=1.7.6 errors with 'norepl' when w=2+
@@ -1406,7 +1406,7 @@ def test_cursor_timeout(self):
 
     def test_distinct(self):
         if not version.at_least(self.db.connection, (1, 1)):
-            raise SkipTest()
+            raise SkipTest("distinct command requires MongoDB >= 1.1")
 
         self.db.drop_collection("test")
 
@@ -1486,7 +1486,7 @@ def test_insert_large_document(self):
 
     def test_map_reduce(self):
         if not version.at_least(self.db.connection, (1, 1, 1)):
-            raise SkipTest()
+            raise SkipTest("mapReduce command requires MongoDB >= 1.1.1")
 
         db = self.db
         db.drop_collection("test")
@@ -1672,7 +1672,7 @@ class ExtendedDict(dict):
 
     def test_find_with_nested(self):
         if not version.at_least(self.db.connection, (2, 0, 0)):
-            raise SkipTest()
+            raise SkipTest("nested $and and $or requires MongoDB >= 2.0")
         c = self.db.test
         c.drop()
         c.insert([{'i': i} for i in range(5)])  # [0, 1, 2, 3, 4]
@@ -1740,7 +1740,7 @@ def transform_outgoing(self, son, collection):
 
     def test_uuid_subtype(self):
         if not have_uuid:
-            raise SkipTest()
+            raise SkipTest("No uuid module")
 
         coll = self.connection.pymongo_test.uuid
         coll.drop()

test/test_connection.py

@@ -277,12 +277,12 @@ def test_from_uri(self):
     def test_fork(self):
         # Test using a connection before and after a fork.
         if sys.platform == "win32":
-            raise SkipTest()
+            raise SkipTest("Can't fork on windows")
 
         try:
             from multiprocessing import Process, Pipe
         except ImportError:
-            raise SkipTest()
+            raise SkipTest("No multiprocessing module")
 
         db = Connection(self.host, self.port).pymongo_test
 
@@ -452,7 +452,7 @@ def test_fsync_lock_unlock(self):
 
     def test_contextlib(self):
         if sys.version_info < (2, 6):
-            raise SkipTest()
+            raise SkipTest("With statement requires Python >= 2.6")
 
         import contextlib
 

test/test_cursor.py

@@ -634,7 +634,7 @@ def test_getitem_numeric_index(self):
 
     def test_count_with_limit_and_skip(self):
         if not version.at_least(self.db.connection, (1, 1, 4, -1)):
-            raise SkipTest()
+            raise SkipTest("count with limit / skip requires MongoDB >= 1.1.4")
 
         def check_len(cursor, length):
             self.assertEqual(len(list(cursor)), cursor.count(True))
@@ -707,7 +707,7 @@ def test_tailable(self):
 
     def test_distinct(self):
         if not version.at_least(self.db.connection, (1, 1, 3, 1)):
-            raise SkipTest()
+            raise SkipTest("distinct with query requires MongoDB >= 1.1.3")
 
         self.db.drop_collection("test")
 
@@ -736,7 +736,7 @@ def test_distinct(self):
 
     def test_max_scan(self):
         if not version.at_least(self.db.connection, (1, 5, 1)):
-            raise SkipTest()
+            raise SkipTest("maxScan requires MongoDB >= 1.5.1")
 
         self.db.drop_collection("test")
         for _ in range(100):
@@ -749,7 +749,7 @@ def test_max_scan(self):
 
     def test_with_statement(self):
         if sys.version_info < (2, 6):
-            raise SkipTest()
+            raise SkipTest("With statement requires Python >= 2.6")
 
         self.db.drop_collection("test")
         for _ in range(100):

test/test_grid_file.py

@@ -477,7 +477,7 @@ def test_set_after_close(self):
 
     def test_context_manager(self):
         if sys.version_info < (2, 6):
-            raise SkipTest()
+            raise SkipTest("With statement requires Python >= 2.6")
 
         contents = b("Imagine this is some important data...")
         # Hack around python2.4 an 2.5 not supporting 'with' syntax

test/test_json_util.py

@@ -44,7 +44,7 @@ class TestJsonUtil(unittest.TestCase):
 
     def setUp(self):
         if not json_util.json_lib:
-            raise SkipTest()
+            raise SkipTest("No json or simplejson module")
 
         self.db = get_connection().pymongo_test
 
@@ -105,7 +105,7 @@ def test_timestamp(self):
 
     def test_uuid(self):
         if not bson.has_uuid():
-            raise SkipTest()
+            raise SkipTest("No uuid module")
         self.round_trip(
                 {'uuid': bson.uuid.UUID(
                             'f47ac10b-58cc-4372-a567-0e02b2c3d479')})

test/test_master_slave_connection.py

@@ -57,7 +57,7 @@ def setUp(self):
             pass
 
         if not self.slaves:
-            raise SkipTest()
+            raise SkipTest("Not connected to master-slave set")
 
         self.connection = MasterSlaveConnection(self.master, self.slaves)
         self.db = self.connection.pymongo_test

test/test_objectid.py

@@ -95,12 +95,12 @@ def test_multiprocessing(self):
         # multiprocessing on windows is weird and I don't feel like figuring it
         # out right now. this should fix buildbot.
         if sys.platform == "win32":
-            raise SkipTest()
+            raise SkipTest("Can't fork on Windows")
 
         try:
             import multiprocessing
         except ImportError:
-            raise SkipTest()
+            raise SkipTest("Can't fork on Windows")
 
         pool = multiprocessing.Pool(2)
         ids = pool.map(oid, range(20))

test/test_replica_set_connection.py

@@ -57,7 +57,7 @@ def setUp(self):
         conn = Connection(pair)
         response = conn.admin.command('ismaster')
         if 'setName' in response:
-            raise SkipTest()
+            raise SkipTest("Not connected to a replica set")
 
     def test_connect(self):
         self.assertRaises(ConfigurationError, ReplicaSetConnection,
@@ -89,7 +89,7 @@ def setUp(self):
                 if m['stateStr'] == 'SECONDARY'
             ]
         else:
-            raise SkipTest()
+            raise SkipTest("Not connected to a replica set")
 
     def _get_connection(self, **kwargs):
         return ReplicaSetConnection(pair,
@@ -376,12 +376,12 @@ def test_fork(self):
         """Test using a connection before and after a fork.
         """
         if sys.platform == "win32":
-            raise SkipTest()
+            raise SkipTest("Can't fork on Windows")
 
         try:
             from multiprocessing import Process, Pipe
         except ImportError:
-            raise SkipTest()
+            raise SkipTest("No multiprocessing module")
 
         db = self._get_connection().pymongo_test
 
@@ -516,7 +516,7 @@ def test_ipv6(self):
         except:
             # Either mongod was started without --ipv6
             # or the OS doesn't support it (or both).
-            raise SkipTest()
+            raise SkipTest("Not connected to a replica set")
 
         # Try a few simple things
         connection = ReplicaSetConnection("mongodb://[::1]:%d" % (port,),