get_mongodb_version tests helper + fix indexing tests in mongodb v2.4
This commit is contained in:
@@ -9,7 +9,8 @@ from nose.plugins.skip import SkipTest
|
||||
from datetime import datetime
|
||||
|
||||
from mongoengine import *
|
||||
from mongoengine.connection import get_db, get_connection
|
||||
from mongoengine.connection import get_db
|
||||
from tests.utils import get_mongodb_version
|
||||
|
||||
__all__ = ("IndexesTest", )
|
||||
|
||||
@@ -494,8 +495,7 @@ class IndexesTest(unittest.TestCase):
|
||||
obj = Test(a=1)
|
||||
obj.save()
|
||||
|
||||
connection = get_connection()
|
||||
IS_MONGODB_3 = connection.server_info()['versionArray'][0] >= 3
|
||||
IS_MONGODB_3 = get_mongodb_version()[0] >= 3
|
||||
|
||||
# Need to be explicit about covered indexes as mongoDB doesn't know if
|
||||
# the documents returned might have more keys in that here.
|
||||
@@ -736,8 +736,7 @@ class IndexesTest(unittest.TestCase):
|
||||
if pymongo.version_tuple[0] < 2 and pymongo.version_tuple[1] < 3:
|
||||
raise SkipTest('pymongo needs to be 2.3 or higher for this test')
|
||||
|
||||
connection = get_connection()
|
||||
version_array = connection.server_info()['versionArray']
|
||||
version_array = get_mongodb_version()
|
||||
if version_array[0] < 2 and version_array[1] < 2:
|
||||
raise SkipTest('MongoDB needs to be 2.2 or higher for this test')
|
||||
|
||||
@@ -875,6 +874,9 @@ class IndexesTest(unittest.TestCase):
|
||||
self.assertTrue(info['provider_ids.foo_1_provider_ids.bar_1']['sparse'])
|
||||
|
||||
def test_text_indexes(self):
|
||||
mongodb_ver = get_mongodb_version()
|
||||
if mongodb_ver[0] == 2 and mongodb_ver[1] < 6:
|
||||
raise SkipTest('Text search is disabled by default in MongoDB < v2.6')
|
||||
|
||||
class Book(Document):
|
||||
title = DictField()
|
||||
|
||||
Reference in New Issue
Block a user