remove unnecessary randomness in indexes tests

mongoengine/base/document.py

@@ -121,7 +121,7 @@ class BaseDocument(object):
                 else:
                     self._data[key] = value
 
-        # Set any get_<field>_display methods
+        # Set any get_fieldname_display methods
         self.__set_field_display()
 
         if self._dynamic:
@@ -1005,18 +1005,19 @@ class BaseDocument(object):
         return '.'.join(parts)
 
     def __set_field_display(self):
-        """For each field that specifies choices, create a
-        get_<field>_display method.
-        """
-        fields_with_choices = [(n, f) for n, f in self._fields.items()
-                               if f.choices]
-        for attr_name, field in fields_with_choices:
-            setattr(self,
+        """Dynamically set the display value for a field with choices"""
+        for attr_name, field in self._fields.items():
+            if field.choices:
+                if self._dynamic:
+                    obj = self
+                else:
+                    obj = type(self)
+                setattr(obj,
                         'get_%s_display' % attr_name,
                         partial(self.__get_field_display, field=field))
 
     def __get_field_display(self, field):
-        """Return the display value for a choice field"""
+        """Returns the display value for a choice field"""
         value = getattr(self, field.name)
         if field.choices and isinstance(field.choices[0], (list, tuple)):
             return dict(field.choices).get(value, value)

tests/document/indexes.py

@@ -2,10 +2,8 @@
 import unittest
 import sys
 
-sys.path[0:0] = [""]
 
 import pymongo
-from random import randint
 
 from nose.plugins.skip import SkipTest
 from datetime import datetime
@@ -17,11 +15,9 @@ __all__ = ("IndexesTest", )
 
 
 class IndexesTest(unittest.TestCase):
-    _MAX_RAND = 10 ** 10
 
     def setUp(self):
-        self.db_name = 'mongoenginetest_IndexesTest_' + str(randint(0, self._MAX_RAND))
-        self.connection = connect(db=self.db_name)
+        self.connection = connect(db='mongoenginetest')
         self.db = get_db()
 
         class Person(Document):

tests/fields/fields.py

@@ -3001,32 +3001,28 @@ class FieldTest(unittest.TestCase):
                 ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
                 ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
             style = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('B', 'Baggy'), ('W', 'Wide')), default='W')
+                ('S', 'Small'), ('B', 'Baggy'), ('W', 'wide')), default='S')
 
         Shirt.drop_collection()
 
-        shirt1 = Shirt()
-        shirt2 = Shirt()
+        shirt = Shirt()
 
-        # Make sure get_<field>_display returns the default value (or None)
-        self.assertEqual(shirt1.get_size_display(), None)
-        self.assertEqual(shirt1.get_style_display(), 'Wide')
+        self.assertEqual(shirt.get_size_display(), None)
+        self.assertEqual(shirt.get_style_display(), 'Small')
 
-        shirt1.size = 'XXL'
-        shirt1.style = 'B'
-        shirt2.size = 'M'
-        shirt2.style = 'S'
-        self.assertEqual(shirt1.get_size_display(), 'Extra Extra Large')
-        self.assertEqual(shirt1.get_style_display(), 'Baggy')
-        self.assertEqual(shirt2.get_size_display(), 'Medium')
-        self.assertEqual(shirt2.get_style_display(), 'Small')
+        shirt.size = "XXL"
+        shirt.style = "B"
+        self.assertEqual(shirt.get_size_display(), 'Extra Extra Large')
+        self.assertEqual(shirt.get_style_display(), 'Baggy')
 
         # Set as Z - an invalid choice
-        shirt1.size = 'Z'
-        shirt1.style = 'Z'
-        self.assertEqual(shirt1.get_size_display(), 'Z')
-        self.assertEqual(shirt1.get_style_display(), 'Z')
-        self.assertRaises(ValidationError, shirt1.validate)
+        shirt.size = "Z"
+        shirt.style = "Z"
+        self.assertEqual(shirt.get_size_display(), 'Z')
+        self.assertEqual(shirt.get_style_display(), 'Z')
+        self.assertRaises(ValidationError, shirt.validate)
+
+        Shirt.drop_collection()
 
     def test_simple_choices_validation(self):
         """Ensure that value is in a container of allowed values.