Additional tests of fundamental Queryable behaviour.

Author: amcgregor

marrow/mongo/core/trait/queryable.py

@@ -184,9 +184,6 @@ def _prepare_aggregate(cls, *args, **kw):
 		if 'projection' in options:
 			stages.append({'$project': options.pop('projection')})
 
-		if 'skip' in options:
-			stages.append({'$skip': options.pop('skip')})
-		
 		return cls, collection, stages, options
 
 	@classmethod
@@ -250,8 +247,10 @@ def find_in_sequence(cls, field, order, *args, **kw):
 				**kw
 			)
 
-		if tuple(collection.database.client.server_info()['versionArray'][:2]) < (3, 4):  # noqa
-			raise RuntimeError("Queryable.find_in_sequence only works against MongoDB server versions 3.4 or newer.")
+		if __debug__:  # noqa
+			# This "foot shot avoidance" check requires a server round-trip, potentially, so we only do this in dev.
+			if tuple(collection.database.client.server_info()['versionArray'][:2]) < (3, 4):  # pragma: no cover
+				raise RuntimeError("Queryable.find_in_sequence only works against MongoDB server versions 3.4 or newer.")
 
 		return collection.aggregate(stages, **options)
 

test/trait/test_queryable.py

@@ -4,9 +4,10 @@
 
 import pytest
 from bson import ObjectId
+from pymongo.cursor import CursorType
 from pymongo.errors import WriteError
 
-from marrow.mongo import Field, Index, U
+from marrow.mongo import Index, U
 from marrow.mongo.field import Integer, String
 from marrow.mongo.trait import Queryable
 
@@ -39,6 +40,47 @@ class Sample(Queryable):
 	return Sample
 
 
+
+class TestQueryableCore(object):
+	def test_prepare_find_cursor_type_explicit(self, Sample):
+		cls, collection, query, options = Sample._prepare_find(cursor_type=CursorType.TAILABLE)
+		assert options['cursor_type'] == CursorType.TAILABLE
+	
+	def test_prepare_find_cursor_conflict(self, Sample):
+		with pytest.raises(TypeError):
+			Sample._prepare_find(cursor_type=CursorType.TAILABLE, tail=True)
+		
+		with pytest.raises(TypeError):
+			Sample._prepare_find(cursor_type=CursorType.TAILABLE, await=True)
+		
+		with pytest.raises(TypeError):
+			Sample._prepare_find(cursor_type=CursorType.TAILABLE, tail=True, await=True)
+	
+	def test_prepare_find_cursor_type_tail(self, Sample):
+		cls, collection, query, options = Sample._prepare_find(tail=True)
+		assert options['cursor_type'] == CursorType.TAILABLE_AWAIT
+	
+	def test_prepare_find_cursor_type_tail_not_await(self, Sample):
+		cls, collection, query, options = Sample._prepare_find(tail=True, await=False)
+		assert options['cursor_type'] == CursorType.TAILABLE
+	
+	def test_prepare_find_cursor_type_await_conflict(self, Sample):
+		with pytest.raises(TypeError):
+			Sample._prepare_find(await=False)
+	
+	def test_prepare_find_max_time_modifier(self, Sample):
+		cls, collection, query, options = Sample._prepare_find(max_time_ms=1000)
+		assert options['modifiers'] == {'$maxTimeMS': 1000}
+	
+	def test_prepare_aggregate_skip_limit(self, Sample):
+		cls, collection, stages, options = Sample._prepare_aggregate(skip=10, limit=10)
+		
+		assert stages == [
+				{'$skip': 10},
+				{'$limit': 10},
+			]
+
+
 class TestQueryableTrait(object):
 	def test_find(self, Sample):
 		rs = Sample.find()