[1.2.X] Fixed a regression in the test suite from [15236]. Backport of r15244.

Also, changed an asertion not supported by unittest.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15255 bcc190cf-cafb-0310-a4f2-bffc1f526a37