jyapayne/mongoengine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 0.7

Browse source 
Conflicts:
	mongoengine/base.py
This commit is contained in:
Ross Lawley 2012-08-07 10:41:49 +01:00
commit 52d80ac23c
12 changed files with 163 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_fields.py
View file

@ -284,6 +284,7 @@ class FieldTest(unittest.TestCase):
uu = uuid.uuid4()
Person(api_key=uu).save()
self.assertEqual(1, Person.objects(api_key=uu).count())
self.assertEqual(uu, Person.objects.first().api_key)
person = Person()
valid = (uuid.uuid4(), uuid.uuid1())
@ -308,6 +309,7 @@ class FieldTest(unittest.TestCase):
uu = uuid.uuid4()
Person(api_key=uu).save()
self.assertEqual(1, Person.objects(api_key=uu).count())
self.assertEqual(uu, Person.objects.first().api_key)
person = Person()
valid = (uuid.uuid4(), uuid.uuid1())