Django

Code

Changeset 8055

Show
Ignore:
Timestamp:
07/22/08 14:48:36 (6 months ago)
Author:
mtredinnick
Message:

Fixed a bunch of Python 2.3 test failures.

All remaining buildbot failures on 2.3 are not due to the test suite, as far as
I can work out.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/tests/regressiontests/admin_scripts/tests.py

    r7941 r8055  
    77import unittest 
    88import shutil 
     9import sys 
    910 
    1011from django import conf, bin, get_version 
    …… 
    738739        args = ['--help'] 
    739740        out, err = self.run_manage(args) 
    740         self.assertOutput(out, "Usage: manage.py [options]") 
     741        if sys.version_info < (2, 4): 
     742            self.assertOutput(out, "usage: manage.py [options]") 
     743        else: 
     744            self.assertOutput(out, "Usage: manage.py [options]") 
    741745        self.assertOutput(err, "Type 'manage.py help <subcommand>' for help on a specific subcommand.") 
    742746 

  • django/trunk/tests/regressiontests/admin_views/tests.py

    r7967 r8055  
    103103        login = self.client.post('/test_admin/admin/', self.super_login) 
    104104        self.assertRedirects(login, '/test_admin/admin/') 
    105         self.assertFalse(login.context) 
     105        self.failIf(login.context) 
    106106        self.client.get('/test_admin/admin/logout/') 
    107107         
    …… 
    125125        login = self.client.post('/test_admin/admin/', self.adduser_login) 
    126126        self.assertRedirects(login, '/test_admin/admin/') 
    127         self.assertFalse(login.context) 
     127        self.failIf(login.context) 
    128128        self.client.get('/test_admin/admin/logout/') 
    129129         
    …… 
    133133        login = self.client.post('/test_admin/admin/', self.changeuser_login) 
    134134        self.assertRedirects(login, '/test_admin/admin/') 
    135         self.assertFalse(login.context) 
     135        self.failIf(login.context) 
    136136        self.client.get('/test_admin/admin/logout/') 
    137137         
    …… 
    141141        login = self.client.post('/test_admin/admin/', self.deleteuser_login) 
    142142        self.assertRedirects(login, '/test_admin/admin/') 
    143         self.assertFalse(login.context) 
     143        self.failIf(login.context) 
    144144        self.client.get('/test_admin/admin/logout/') 
    145145         

  • django/trunk/tests/regressiontests/utils/tests.py

    r7914 r8055  
    1111import itercompat 
    1212from decorators import DecoratorFromMiddlewareTests 
     13 
     14# We need this because "datastructures" uses sorted() and the tests are run in 
     15# the scope of this module. 
     16try: 
     17    sorted 
     18except NameError: 
     19    from django.utils.itercompat import sorted  # For Python 2.3 
    1320 
    1421# Extra tests