ran unittest2pytest
This commit is contained in:
		| @@ -64,13 +64,13 @@ class TestFileField(MongoDBTestCase): | ||||
|         putfile.save() | ||||
|  | ||||
|         result = PutFile.objects.first() | ||||
|         self.assertEqual(putfile, result) | ||||
|         self.assertEqual( | ||||
|             "%s" % result.the_file, | ||||
|             "<GridFSProxy: hello (%s)>" % result.the_file.grid_id, | ||||
|         assert putfile == result | ||||
|         assert ( | ||||
|             "%s" % result.the_file | ||||
|             == "<GridFSProxy: hello (%s)>" % result.the_file.grid_id | ||||
|         ) | ||||
|         self.assertEqual(result.the_file.read(), text) | ||||
|         self.assertEqual(result.the_file.content_type, content_type) | ||||
|         assert result.the_file.read() == text | ||||
|         assert result.the_file.content_type == content_type | ||||
|         result.the_file.delete()  # Remove file from GridFS | ||||
|         PutFile.objects.delete() | ||||
|  | ||||
| @@ -85,9 +85,9 @@ class TestFileField(MongoDBTestCase): | ||||
|         putfile.save() | ||||
|  | ||||
|         result = PutFile.objects.first() | ||||
|         self.assertEqual(putfile, result) | ||||
|         self.assertEqual(result.the_file.read(), text) | ||||
|         self.assertEqual(result.the_file.content_type, content_type) | ||||
|         assert putfile == result | ||||
|         assert result.the_file.read() == text | ||||
|         assert result.the_file.content_type == content_type | ||||
|         result.the_file.delete() | ||||
|  | ||||
|     def test_file_fields_stream(self): | ||||
| @@ -111,19 +111,19 @@ class TestFileField(MongoDBTestCase): | ||||
|         streamfile.save() | ||||
|  | ||||
|         result = StreamFile.objects.first() | ||||
|         self.assertEqual(streamfile, result) | ||||
|         self.assertEqual(result.the_file.read(), text + more_text) | ||||
|         self.assertEqual(result.the_file.content_type, content_type) | ||||
|         assert streamfile == result | ||||
|         assert result.the_file.read() == text + more_text | ||||
|         assert result.the_file.content_type == content_type | ||||
|         result.the_file.seek(0) | ||||
|         self.assertEqual(result.the_file.tell(), 0) | ||||
|         self.assertEqual(result.the_file.read(len(text)), text) | ||||
|         self.assertEqual(result.the_file.tell(), len(text)) | ||||
|         self.assertEqual(result.the_file.read(len(more_text)), more_text) | ||||
|         self.assertEqual(result.the_file.tell(), len(text + more_text)) | ||||
|         assert result.the_file.tell() == 0 | ||||
|         assert result.the_file.read(len(text)) == text | ||||
|         assert result.the_file.tell() == len(text) | ||||
|         assert result.the_file.read(len(more_text)) == more_text | ||||
|         assert result.the_file.tell() == len(text + more_text) | ||||
|         result.the_file.delete() | ||||
|  | ||||
|         # Ensure deleted file returns None | ||||
|         self.assertTrue(result.the_file.read() is None) | ||||
|         assert result.the_file.read() is None | ||||
|  | ||||
|     def test_file_fields_stream_after_none(self): | ||||
|         """Ensure that a file field can be written to after it has been saved as | ||||
| @@ -148,19 +148,19 @@ class TestFileField(MongoDBTestCase): | ||||
|         streamfile.save() | ||||
|  | ||||
|         result = StreamFile.objects.first() | ||||
|         self.assertEqual(streamfile, result) | ||||
|         self.assertEqual(result.the_file.read(), text + more_text) | ||||
|         assert streamfile == result | ||||
|         assert result.the_file.read() == text + more_text | ||||
|         # self.assertEqual(result.the_file.content_type, content_type) | ||||
|         result.the_file.seek(0) | ||||
|         self.assertEqual(result.the_file.tell(), 0) | ||||
|         self.assertEqual(result.the_file.read(len(text)), text) | ||||
|         self.assertEqual(result.the_file.tell(), len(text)) | ||||
|         self.assertEqual(result.the_file.read(len(more_text)), more_text) | ||||
|         self.assertEqual(result.the_file.tell(), len(text + more_text)) | ||||
|         assert result.the_file.tell() == 0 | ||||
|         assert result.the_file.read(len(text)) == text | ||||
|         assert result.the_file.tell() == len(text) | ||||
|         assert result.the_file.read(len(more_text)) == more_text | ||||
|         assert result.the_file.tell() == len(text + more_text) | ||||
|         result.the_file.delete() | ||||
|  | ||||
|         # Ensure deleted file returns None | ||||
|         self.assertTrue(result.the_file.read() is None) | ||||
|         assert result.the_file.read() is None | ||||
|  | ||||
|     def test_file_fields_set(self): | ||||
|         class SetFile(Document): | ||||
| @@ -176,16 +176,16 @@ class TestFileField(MongoDBTestCase): | ||||
|         setfile.save() | ||||
|  | ||||
|         result = SetFile.objects.first() | ||||
|         self.assertEqual(setfile, result) | ||||
|         self.assertEqual(result.the_file.read(), text) | ||||
|         assert setfile == result | ||||
|         assert result.the_file.read() == text | ||||
|  | ||||
|         # Try replacing file with new one | ||||
|         result.the_file.replace(more_text) | ||||
|         result.save() | ||||
|  | ||||
|         result = SetFile.objects.first() | ||||
|         self.assertEqual(setfile, result) | ||||
|         self.assertEqual(result.the_file.read(), more_text) | ||||
|         assert setfile == result | ||||
|         assert result.the_file.read() == more_text | ||||
|         result.the_file.delete() | ||||
|  | ||||
|     def test_file_field_no_default(self): | ||||
| @@ -205,28 +205,28 @@ class TestFileField(MongoDBTestCase): | ||||
|             doc_b = GridDocument.objects.with_id(doc_a.id) | ||||
|             doc_b.the_file.replace(f, filename="doc_b") | ||||
|             doc_b.save() | ||||
|             self.assertNotEqual(doc_b.the_file.grid_id, None) | ||||
|             assert doc_b.the_file.grid_id != None | ||||
|  | ||||
|             # Test it matches | ||||
|             doc_c = GridDocument.objects.with_id(doc_b.id) | ||||
|             self.assertEqual(doc_b.the_file.grid_id, doc_c.the_file.grid_id) | ||||
|             assert doc_b.the_file.grid_id == doc_c.the_file.grid_id | ||||
|  | ||||
|             # Test with default | ||||
|             doc_d = GridDocument(the_file=six.b("")) | ||||
|             doc_d.save() | ||||
|  | ||||
|             doc_e = GridDocument.objects.with_id(doc_d.id) | ||||
|             self.assertEqual(doc_d.the_file.grid_id, doc_e.the_file.grid_id) | ||||
|             assert doc_d.the_file.grid_id == doc_e.the_file.grid_id | ||||
|  | ||||
|             doc_e.the_file.replace(f, filename="doc_e") | ||||
|             doc_e.save() | ||||
|  | ||||
|             doc_f = GridDocument.objects.with_id(doc_e.id) | ||||
|             self.assertEqual(doc_e.the_file.grid_id, doc_f.the_file.grid_id) | ||||
|             assert doc_e.the_file.grid_id == doc_f.the_file.grid_id | ||||
|  | ||||
|         db = GridDocument._get_db() | ||||
|         grid_fs = gridfs.GridFS(db) | ||||
|         self.assertEqual(["doc_b", "doc_e"], grid_fs.list()) | ||||
|         assert ["doc_b", "doc_e"] == grid_fs.list() | ||||
|  | ||||
|     def test_file_uniqueness(self): | ||||
|         """Ensure that each instance of a FileField is unique | ||||
| @@ -246,8 +246,8 @@ class TestFileField(MongoDBTestCase): | ||||
|         test_file_dupe = TestFile() | ||||
|         data = test_file_dupe.the_file.read()  # Should be None | ||||
|  | ||||
|         self.assertNotEqual(test_file.name, test_file_dupe.name) | ||||
|         self.assertNotEqual(test_file.the_file.read(), data) | ||||
|         assert test_file.name != test_file_dupe.name | ||||
|         assert test_file.the_file.read() != data | ||||
|  | ||||
|         TestFile.drop_collection() | ||||
|  | ||||
| @@ -268,8 +268,8 @@ class TestFileField(MongoDBTestCase): | ||||
|         marmot.save() | ||||
|  | ||||
|         marmot = Animal.objects.get() | ||||
|         self.assertEqual(marmot.photo.content_type, "image/jpeg") | ||||
|         self.assertEqual(marmot.photo.foo, "bar") | ||||
|         assert marmot.photo.content_type == "image/jpeg" | ||||
|         assert marmot.photo.foo == "bar" | ||||
|  | ||||
|     def test_file_reassigning(self): | ||||
|         class TestFile(Document): | ||||
| @@ -278,12 +278,12 @@ class TestFileField(MongoDBTestCase): | ||||
|         TestFile.drop_collection() | ||||
|  | ||||
|         test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save() | ||||
|         self.assertEqual(test_file.the_file.get().length, 8313) | ||||
|         assert test_file.the_file.get().length == 8313 | ||||
|  | ||||
|         test_file = TestFile.objects.first() | ||||
|         test_file.the_file = get_file(TEST_IMAGE2_PATH) | ||||
|         test_file.save() | ||||
|         self.assertEqual(test_file.the_file.get().length, 4971) | ||||
|         assert test_file.the_file.get().length == 4971 | ||||
|  | ||||
|     def test_file_boolean(self): | ||||
|         """Ensure that a boolean test of a FileField indicates its presence | ||||
| @@ -295,13 +295,13 @@ class TestFileField(MongoDBTestCase): | ||||
|         TestFile.drop_collection() | ||||
|  | ||||
|         test_file = TestFile() | ||||
|         self.assertFalse(bool(test_file.the_file)) | ||||
|         assert not bool(test_file.the_file) | ||||
|         test_file.the_file.put(six.b("Hello, World!"), content_type="text/plain") | ||||
|         test_file.save() | ||||
|         self.assertTrue(bool(test_file.the_file)) | ||||
|         assert bool(test_file.the_file) | ||||
|  | ||||
|         test_file = TestFile.objects.first() | ||||
|         self.assertEqual(test_file.the_file.content_type, "text/plain") | ||||
|         assert test_file.the_file.content_type == "text/plain" | ||||
|  | ||||
|     def test_file_cmp(self): | ||||
|         """Test comparing against other types""" | ||||
| @@ -310,7 +310,7 @@ class TestFileField(MongoDBTestCase): | ||||
|             the_file = FileField() | ||||
|  | ||||
|         test_file = TestFile() | ||||
|         self.assertNotIn(test_file.the_file, [{"test": 1}]) | ||||
|         assert test_file.the_file not in [{"test": 1}] | ||||
|  | ||||
|     def test_file_disk_space(self): | ||||
|         """ Test disk space usage when we delete/replace a file """ | ||||
| @@ -330,16 +330,16 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         files = db.fs.files.find() | ||||
|         chunks = db.fs.chunks.find() | ||||
|         self.assertEqual(len(list(files)), 1) | ||||
|         self.assertEqual(len(list(chunks)), 1) | ||||
|         assert len(list(files)) == 1 | ||||
|         assert len(list(chunks)) == 1 | ||||
|  | ||||
|         # Deleting the docoument should delete the files | ||||
|         testfile.delete() | ||||
|  | ||||
|         files = db.fs.files.find() | ||||
|         chunks = db.fs.chunks.find() | ||||
|         self.assertEqual(len(list(files)), 0) | ||||
|         self.assertEqual(len(list(chunks)), 0) | ||||
|         assert len(list(files)) == 0 | ||||
|         assert len(list(chunks)) == 0 | ||||
|  | ||||
|         # Test case where we don't store a file in the first place | ||||
|         testfile = TestFile() | ||||
| @@ -347,15 +347,15 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         files = db.fs.files.find() | ||||
|         chunks = db.fs.chunks.find() | ||||
|         self.assertEqual(len(list(files)), 0) | ||||
|         self.assertEqual(len(list(chunks)), 0) | ||||
|         assert len(list(files)) == 0 | ||||
|         assert len(list(chunks)) == 0 | ||||
|  | ||||
|         testfile.delete() | ||||
|  | ||||
|         files = db.fs.files.find() | ||||
|         chunks = db.fs.chunks.find() | ||||
|         self.assertEqual(len(list(files)), 0) | ||||
|         self.assertEqual(len(list(chunks)), 0) | ||||
|         assert len(list(files)) == 0 | ||||
|         assert len(list(chunks)) == 0 | ||||
|  | ||||
|         # Test case where we overwrite the file | ||||
|         testfile = TestFile() | ||||
| @@ -368,15 +368,15 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         files = db.fs.files.find() | ||||
|         chunks = db.fs.chunks.find() | ||||
|         self.assertEqual(len(list(files)), 1) | ||||
|         self.assertEqual(len(list(chunks)), 1) | ||||
|         assert len(list(files)) == 1 | ||||
|         assert len(list(chunks)) == 1 | ||||
|  | ||||
|         testfile.delete() | ||||
|  | ||||
|         files = db.fs.files.find() | ||||
|         chunks = db.fs.chunks.find() | ||||
|         self.assertEqual(len(list(files)), 0) | ||||
|         self.assertEqual(len(list(chunks)), 0) | ||||
|         assert len(list(files)) == 0 | ||||
|         assert len(list(chunks)) == 0 | ||||
|  | ||||
|     def test_image_field(self): | ||||
|         if not HAS_PIL: | ||||
| @@ -396,9 +396,7 @@ class TestFileField(MongoDBTestCase): | ||||
|                 t.image.put(f) | ||||
|                 self.fail("Should have raised an invalidation error") | ||||
|             except ValidationError as e: | ||||
|                 self.assertEqual( | ||||
|                     "%s" % e, "Invalid image: cannot identify image file %s" % f | ||||
|                 ) | ||||
|                 assert "%s" % e == "Invalid image: cannot identify image file %s" % f | ||||
|  | ||||
|         t = TestImage() | ||||
|         t.image.put(get_file(TEST_IMAGE_PATH)) | ||||
| @@ -406,11 +404,11 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         t = TestImage.objects.first() | ||||
|  | ||||
|         self.assertEqual(t.image.format, "PNG") | ||||
|         assert t.image.format == "PNG" | ||||
|  | ||||
|         w, h = t.image.size | ||||
|         self.assertEqual(w, 371) | ||||
|         self.assertEqual(h, 76) | ||||
|         assert w == 371 | ||||
|         assert h == 76 | ||||
|  | ||||
|         t.image.delete() | ||||
|  | ||||
| @@ -424,12 +422,12 @@ class TestFileField(MongoDBTestCase): | ||||
|         TestFile.drop_collection() | ||||
|  | ||||
|         test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save() | ||||
|         self.assertEqual(test_file.the_file.size, (371, 76)) | ||||
|         assert test_file.the_file.size == (371, 76) | ||||
|  | ||||
|         test_file = TestFile.objects.first() | ||||
|         test_file.the_file = get_file(TEST_IMAGE2_PATH) | ||||
|         test_file.save() | ||||
|         self.assertEqual(test_file.the_file.size, (45, 101)) | ||||
|         assert test_file.the_file.size == (45, 101) | ||||
|  | ||||
|     def test_image_field_resize(self): | ||||
|         if not HAS_PIL: | ||||
| @@ -446,11 +444,11 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         t = TestImage.objects.first() | ||||
|  | ||||
|         self.assertEqual(t.image.format, "PNG") | ||||
|         assert t.image.format == "PNG" | ||||
|         w, h = t.image.size | ||||
|  | ||||
|         self.assertEqual(w, 185) | ||||
|         self.assertEqual(h, 37) | ||||
|         assert w == 185 | ||||
|         assert h == 37 | ||||
|  | ||||
|         t.image.delete() | ||||
|  | ||||
| @@ -469,11 +467,11 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         t = TestImage.objects.first() | ||||
|  | ||||
|         self.assertEqual(t.image.format, "PNG") | ||||
|         assert t.image.format == "PNG" | ||||
|         w, h = t.image.size | ||||
|  | ||||
|         self.assertEqual(w, 185) | ||||
|         self.assertEqual(h, 37) | ||||
|         assert w == 185 | ||||
|         assert h == 37 | ||||
|  | ||||
|         t.image.delete() | ||||
|  | ||||
| @@ -492,9 +490,9 @@ class TestFileField(MongoDBTestCase): | ||||
|  | ||||
|         t = TestImage.objects.first() | ||||
|  | ||||
|         self.assertEqual(t.image.thumbnail.format, "PNG") | ||||
|         self.assertEqual(t.image.thumbnail.width, 92) | ||||
|         self.assertEqual(t.image.thumbnail.height, 18) | ||||
|         assert t.image.thumbnail.format == "PNG" | ||||
|         assert t.image.thumbnail.width == 92 | ||||
|         assert t.image.thumbnail.height == 18 | ||||
|  | ||||
|         t.image.delete() | ||||
|  | ||||
| @@ -518,17 +516,17 @@ class TestFileField(MongoDBTestCase): | ||||
|         test_file.save() | ||||
|  | ||||
|         data = get_db("test_files").macumba.files.find_one() | ||||
|         self.assertEqual(data.get("name"), "hello.txt") | ||||
|         assert data.get("name") == "hello.txt" | ||||
|  | ||||
|         test_file = TestFile.objects.first() | ||||
|         self.assertEqual(test_file.the_file.read(), six.b("Hello, World!")) | ||||
|         assert test_file.the_file.read() == six.b("Hello, World!") | ||||
|  | ||||
|         test_file = TestFile.objects.first() | ||||
|         test_file.the_file = six.b("HELLO, WORLD!") | ||||
|         test_file.save() | ||||
|  | ||||
|         test_file = TestFile.objects.first() | ||||
|         self.assertEqual(test_file.the_file.read(), six.b("HELLO, WORLD!")) | ||||
|         assert test_file.the_file.read() == six.b("HELLO, WORLD!") | ||||
|  | ||||
|     def test_copyable(self): | ||||
|         class PutFile(Document): | ||||
| @@ -546,8 +544,8 @@ class TestFileField(MongoDBTestCase): | ||||
|         class TestFile(Document): | ||||
|             name = StringField() | ||||
|  | ||||
|         self.assertEqual(putfile, copy.copy(putfile)) | ||||
|         self.assertEqual(putfile, copy.deepcopy(putfile)) | ||||
|         assert putfile == copy.copy(putfile) | ||||
|         assert putfile == copy.deepcopy(putfile) | ||||
|  | ||||
|     def test_get_image_by_grid_id(self): | ||||
|  | ||||
| @@ -569,9 +567,7 @@ class TestFileField(MongoDBTestCase): | ||||
|         test = TestImage.objects.first() | ||||
|         grid_id = test.image1.grid_id | ||||
|  | ||||
|         self.assertEqual( | ||||
|             1, TestImage.objects(Q(image1=grid_id) or Q(image2=grid_id)).count() | ||||
|         ) | ||||
|         assert 1 == TestImage.objects(Q(image1=grid_id) or Q(image2=grid_id)).count() | ||||
|  | ||||
|     def test_complex_field_filefield(self): | ||||
|         """Ensure you can add meta data to file""" | ||||
| @@ -593,9 +589,9 @@ class TestFileField(MongoDBTestCase): | ||||
|         marmot.save() | ||||
|  | ||||
|         marmot = Animal.objects.get() | ||||
|         self.assertEqual(marmot.photos[0].content_type, "image/jpeg") | ||||
|         self.assertEqual(marmot.photos[0].foo, "bar") | ||||
|         self.assertEqual(marmot.photos[0].get().length, 8313) | ||||
|         assert marmot.photos[0].content_type == "image/jpeg" | ||||
|         assert marmot.photos[0].foo == "bar" | ||||
|         assert marmot.photos[0].get().length == 8313 | ||||
|  | ||||
|  | ||||
| if __name__ == "__main__": | ||||
|   | ||||
		Reference in New Issue
	
	Block a user