From 20cdc64588b0f6ae52f8380c11d0ed848005377b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 27 Sep 2012 02:37:33 -0400 Subject: trying different approaches to test layout. in this one, the testing modules become an externally usable package but still remains within the main sqlalchemy parent package. in this system, we use kind of an ugly hack to get the noseplugin imported outside of the "sqlalchemy" package, while still making it available within sqlalchemy for usage by third party libraries. --- test/dialect/test_postgresql.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'test/dialect/test_postgresql.py') diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py index 73633c128..6351ce9d0 100644 --- a/test/dialect/test_postgresql.py +++ b/test/dialect/test_postgresql.py @@ -2,19 +2,24 @@ from __future__ import with_statement -from test.lib.testing import eq_, assert_raises, assert_raises_message, is_ -from test.lib import engines +from sqlalchemy.testing.assertions import eq_, assert_raises, \ + assert_raises_message, is_, AssertsExecutionResults, \ + AssertsCompiledSQL, ComparesTables +from sqlalchemy.testing import engines, fixtures +from sqlalchemy import testing import datetime -from sqlalchemy import * -from sqlalchemy.orm import * +from sqlalchemy import Table, Column, select, MetaData, text, Integer, \ + String, Sequence, ForeignKey, join, Numeric, \ + PrimaryKeyConstraint, DateTime, tuple_, Float, BigInteger, \ + func, literal_column, literal, bindparam, cast, extract, \ + SmallInteger, Enum, REAL, update, insert, Index, delete, \ + and_, Date, TypeDecorator, Time, Unicode, Interval +from sqlalchemy.orm import Session, mapper, aliased from sqlalchemy import exc, schema, types from sqlalchemy.dialects.postgresql import base as postgresql -from sqlalchemy.engine.strategies import MockEngineStrategy from sqlalchemy.util.compat import decimal -from test.lib import * -from test.lib.util import round_decimal +from sqlalchemy.testing.util import round_decimal from sqlalchemy.sql import table, column -from test.lib.testing import eq_ import logging class SequenceTest(fixtures.TestBase, AssertsCompiledSQL): -- cgit v1.2.1