Commit 03ab30c3 authored by Luke Plant's avatar Luke Plant
Browse files

[1.2.X] Fixed test failure when using Python 2.7 

Backport of [14309] from trunk.

Fixed #14947

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

tests/regressiontests/fixtures_regress/tests.py

+7 −1
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

# Unittests for fixtures.

import os

import re

import sys

try:

    from cStringIO import StringIO
@@ -327,9 +328,14 @@ class TestFixtures(TestCase): 


        # Output order isn't guaranteed, so check for parts

        data = stdout.getvalue()



        # Get rid of artifacts like '000000002' to eliminate the differences

        # between different Python versions.

        data = re.sub('0{6,}\d', '', data)



        lion_json = '{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}'

        emu_json = '{"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}'

        platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2000000000000002, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}'

        platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}'

        platypus_json = platypus_json % animal.pk



        self.assertEqual(len(data), len('[%s]' % ', '.join([lion_json, emu_json, platypus_json])))