pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fix tests

Browse Source
This commit is contained in:
Ross Lawley
2013-01-28 14:28:40 +00:00
parent 8eda52e8e0
commit 3208a7f15d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/fields/fields.py
View File

@@ -1725,9 +1725,6 @@ class FieldTest(unittest.TestCase):
Shirt.drop_collection() Shirt.drop_collection()
<<<<<<< HEAD:tests/fields/fields.py
=======
def test_simple_choices_validation_invalid_value(self): def test_simple_choices_validation_invalid_value(self):
"""Ensure that error messages are correct. """Ensure that error messages are correct.
""" """
@@ -2060,7 +2057,6 @@ class FieldTest(unittest.TestCase):
self.assertEqual(test_file.the_file.read(), self.assertEqual(test_file.the_file.read(),
b('Hello, World!')) b('Hello, World!'))
>>>>>>> de5fbfde2ca96b93490e0bc96e04f3aa4affcfb5:tests/test_fields.py
def test_geo_indexes(self): def test_geo_indexes(self):
"""Ensure that indexes are created automatically for GeoPointFields. """Ensure that indexes are created automatically for GeoPointFields.
""" """