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

Conflicts:
	mongoengine/queryset.py
	tests/queryset.py
This commit is contained in:
Harry Marr
2010-10-03 01:57:22 +01:00
2 changed files with 11 additions and 3 deletions

View File

@@ -717,6 +717,11 @@ class QuerySetTest(unittest.TestCase):
post.reload()
self.assertEqual(post.tags, tags)
BlogPost.objects.update_one(add_to_set__tags='unique')
BlogPost.objects.update_one(add_to_set__tags='unique')
post.reload()
self.assertEqual(post.tags.count('unique'), 1)
BlogPost.drop_collection()
def test_update_pull(self):