Commit 121d2e36 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch,...

Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1070c57b
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
import unittest
import fields
from django.contrib.admindocs import views
from django.db.models import fields as builtin_fields
from django.utils import unittest

import fields


class TestFieldType(unittest.TestCase):
+3 −3
Original line number Diff line number Diff line
import unittest
from django import forms
from django.contrib.formtools import preview, wizard, utils
from django import http
from django.contrib.formtools import preview, wizard, utils
from django.test import TestCase
from django.utils import unittest

success_string = "Done was called!"

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ class SpatiaLiteCreation(DatabaseCreation):
        self.connection.close()

        self.connection.settings_dict["NAME"] = test_database_name
        can_rollback = self._rollback_works()
        self.connection.settings_dict["SUPPORTS_TRANSACTIONS"] = can_rollback
        # Confirm the feature set of the test database
        self.connection.features.confirm()
        # Need to load the SpatiaLite initialization SQL before running `syncdb`.
        self.load_spatialite_sql()
        call_command('syncdb', verbosity=verbosity, interactive=False, database=self.connection.alias)
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
Module for executing all of the GDAL tests.  None
of these tests require the use of the database.
"""
from unittest import TestSuite, TextTestRunner
from django.utils.unittest import TestSuite, TextTestRunner

# Importing the GDAL test modules.
import test_driver, test_ds, test_envelope, test_geom, test_srs
+42 −41
Original line number Diff line number Diff line
import unittest
from django.contrib.gis.gdal import Envelope, OGRException
from django.utils import unittest


class TestPoint(object):
    def __init__(self, x, y):
Loading