From 7850e47bf789949afcf21455cd919601484ae15d Mon Sep 17 00:00:00 2001 From: Stefan Wojcik Date: Sun, 26 Feb 2017 02:24:48 -0500 Subject: [PATCH] fix the $max operator --- tests/queryset/geo.py | 6 ++---- tests/queryset/queryset.py | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py index 45f4db4d..3d8b307d 100644 --- a/tests/queryset/geo.py +++ b/tests/queryset/geo.py @@ -155,9 +155,7 @@ class GeoQueriesTest(MongoDBTestCase): """Ensure that spherical geospatial queries are working """ # Needs MongoDB > 2.6.4 https://jira.mongodb.org/browse/SERVER-14039 - connection = get_connection() - info = connection.test.command('buildInfo') - mongodb_version = tuple([int(i) for i in info['version'].split('.')]) + mongodb_version = get_mongodb_version() if mongodb_version < (2, 6, 4): raise SkipTest("Need MongoDB version 2.6.4+") @@ -314,7 +312,7 @@ class GeoQueriesTest(MongoDBTestCase): self.assertEqual(events.count(), 0) # $minDistance was only added in MongoDB v2.6, skip for older versions - mongodb_ver = get_mongodb_ver() + mongodb_ver = get_mongodb_version() if mongodb_ver[0] == 2 and mongodb_ver[1] < 6: raise SkipTest('Need MongoDB v2.6+') diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index ae608bdb..ed124853 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -584,10 +584,10 @@ class QuerySetTest(unittest.TestCase): Scores.objects(id=scores.id).update(min__low_score=250) self.assertEqual(Scores.objects.get(id=scores.id).low_score, 150) - Scores.objects(id=scores.id).update(max__high_score=250) - self.assertEqual(Scores.objects.get(id=scores.id).low_score, 250) - Scores.objects(id=scores.id).update(max__high_score=100) - self.assertEqual(Scores.objects.get(id=scores.id).low_score, 250) + Scores.objects(id=scores.id).update(max__high_score=1000) + self.assertEqual(Scores.objects.get(id=scores.id).low_score, 1000) + Scores.objects(id=scores.id).update(max__high_score=500) + self.assertEqual(Scores.objects.get(id=scores.id).low_score, 1000) def test_updates_can_have_match_operators(self):