Author: ramiro
Date: 2011-01-20 19:37:08 -0600 (Thu, 20 Jan 2011)
New Revision: 15255
Modified:
django/branches/releases/1.2.X/tests/regressiontests/test_client_regress/models.py
Log:
[1.2.X] Fixed a regression in the test suite from [15236]. Backport of r15244.
Also, changed an asertion not supported by unittest.
Modified:
django/branches/releases/1.2.X/tests/regressiontests/test_client_regress/models.py
===================================================================
---
django/branches/releases/1.2.X/tests/regressiontests/test_client_regress/models.py
2011-01-21 01:04:05 UTC (rev 15254)
+++
django/branches/releases/1.2.X/tests/regressiontests/test_client_regress/models.py
2011-01-21 01:37:08 UTC (rev 15255)
@@ -844,10 +844,11 @@
encode_file('IGNORE', 'IGNORE',
DummyFile("file.bin"))[2])
self.assertEqual('Content-Type: text/plain',
encode_file('IGNORE', 'IGNORE',
DummyFile("file.txt"))[2])
- self.assertIn(encode_file('IGNORE', 'IGNORE',
DummyFile("file.zip"))[2], (
+ self.assertTrue(encode_file('IGNORE', 'IGNORE',
DummyFile("file.zip"))[2] in (
'Content-Type: application/x-compress',
'Content-Type: application/x-zip',
- 'Content-Type: application/x-zip-compressed'))
+ 'Content-Type: application/x-zip-compressed',
+ 'Content-Type: application/zip'))
self.assertEqual('Content-Type: application/octet-stream',
encode_file('IGNORE', 'IGNORE',
DummyFile("file.unknown"))[2])
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
