summaryrefslogtreecommitdiff
path: root/test/orm/alltests.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-12-18 18:11:12 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-12-18 18:11:12 +0000
commitd76dc73f33b6607b3805dc0efa29a98057afdb55 (patch)
tree2e626930b332f8e8d3ba60facf5fa420d9534e4e /test/orm/alltests.py
parentbe5d3263436b81fb179c8189f1064d477d5fb3e6 (diff)
downloadsqlalchemy-d76dc73f33b6607b3805dc0efa29a98057afdb55.tar.gz
merge the test/ directory from -r5438:5439 of py3k_warnings branch. this gives
us a 2.5-frozen copy of unittest so we're insulated from unittest changes.
Diffstat (limited to 'test/orm/alltests.py')
-rw-r--r--test/orm/alltests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/orm/alltests.py b/test/orm/alltests.py
index cd12f65b0..c38e2a444 100644
--- a/test/orm/alltests.py
+++ b/test/orm/alltests.py
@@ -1,5 +1,5 @@
import testenv; testenv.configure_for_tests()
-import unittest
+from testlib import sa_unittest as unittest
import inheritance.alltests as inheritance
import sharding.alltests as sharding