Merge branch 'master' of http://github.com/ixc/mongoengine into v0.4

Conflicts:
	mongoengine/fields.py
	mongoengine/queryset.py
This commit is contained in:
Harry Marr
2010-10-17 13:54:16 +01:00
3 changed files with 8 additions and 3 deletions

View File

@@ -545,6 +545,7 @@ class FieldTest(unittest.TestCase):
user.save()
user = User.objects(bookmarks__all=[post_1, link_1]).first()
print User.objects(bookmarks__all=[post_1, link_1]).explain()
self.assertEqual(user.bookmarks[0], post_1)
self.assertEqual(user.bookmarks[1], link_1)