diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-12-11 18:43:05 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-12-11 18:43:05 +0000 |
commit | 5b0c456abd7756fa50700b7332f2cbe1d5aef620 (patch) | |
tree | c9307ff4925341be7e97d90dcd7781cdf93f1641 /test/testlib/testing.py | |
parent | e98b9361294ab0cd2b336e55284310217c9b6e50 (diff) | |
download | sqlalchemy-5b0c456abd7756fa50700b7332f2cbe1d5aef620.tar.gz |
fix circular import
Diffstat (limited to 'test/testlib/testing.py')
-rw-r--r-- | test/testlib/testing.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/testlib/testing.py b/test/testlib/testing.py index a7ac13849..0bf083bbd 100644 --- a/test/testlib/testing.py +++ b/test/testlib/testing.py @@ -13,7 +13,6 @@ from cStringIO import StringIO import testlib.config as config from testlib.compat import _function_named -from testlib import assertsql # Delayed imports MetaData = None @@ -725,6 +724,7 @@ class AssertsExecutionResults(object): return True def assert_sql_execution(self, db, callable_, *rules): + from testlib import assertsql assertsql.asserter.add_rules(rules) try: callable_() @@ -733,6 +733,8 @@ class AssertsExecutionResults(object): assertsql.asserter.clear_rules() def assert_sql(self, db, callable_, list_, with_sequences=None): + from testlib import assertsql + if with_sequences is not None and config.db.name in ('firebird', 'oracle', 'postgres'): rules = with_sequences else: @@ -751,6 +753,7 @@ class AssertsExecutionResults(object): self.assert_sql_execution(db, callable_, *newrules) def assert_sql_count(self, db, callable_, count): + from testlib import assertsql self.assert_sql_execution(db, callable_, assertsql.CountStatements(count)) |