From d76dc73f33b6607b3805dc0efa29a98057afdb55 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 18 Dec 2008 18:11:12 +0000 Subject: 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. --- test/sql/alltests.py | 2 +- test/sql/generative.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'test/sql') diff --git a/test/sql/alltests.py b/test/sql/alltests.py index 173b04632..f01b0e620 100644 --- a/test/sql/alltests.py +++ b/test/sql/alltests.py @@ -1,5 +1,5 @@ import testenv; testenv.configure_for_tests() -import unittest +from testlib import sa_unittest as unittest def suite(): diff --git a/test/sql/generative.py b/test/sql/generative.py index daa2432da..39a72d89b 100644 --- a/test/sql/generative.py +++ b/test/sql/generative.py @@ -26,6 +26,8 @@ class TraversalTest(TestBase, AssertsExecutionResults): def is_other(self, other): return other is self + __hash__ = ClauseElement.__hash__ + def __eq__(self, other): return other.expr == self.expr @@ -49,6 +51,8 @@ class TraversalTest(TestBase, AssertsExecutionResults): return False return True + __hash__ = ClauseElement.__hash__ + def __eq__(self, other): for i1, i2 in zip(self.items, other.items): if i1 != i2: -- cgit v1.2.1