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/engine/test_bind.py | 10 +++++----- test/engine/test_ddlevents.py | 17 +++++++++-------- test/engine/test_execute.py | 13 +++++++------ test/engine/test_parseconnect.py | 5 +++-- test/engine/test_pool.py | 10 +++++----- test/engine/test_processors.py | 4 ++-- test/engine/test_reconnect.py | 13 +++++++------ test/engine/test_reflection.py | 9 +++++---- test/engine/test_transaction.py | 12 ++++++------ 9 files changed, 49 insertions(+), 44 deletions(-) (limited to 'test/engine') diff --git a/test/engine/test_bind.py b/test/engine/test_bind.py index 0d7b7d693..30ee43b3b 100644 --- a/test/engine/test_bind.py +++ b/test/engine/test_bind.py @@ -1,15 +1,15 @@ """tests the "bind" attribute/argument across schema and SQL, including the deprecated versions of these arguments""" -from test.lib.testing import eq_, assert_raises +from sqlalchemy.testing import eq_, assert_raises from sqlalchemy import engine, exc from sqlalchemy import MetaData, ThreadLocalMetaData from sqlalchemy import Integer, text -from test.lib.schema import Table -from test.lib.schema import Column +from sqlalchemy.testing.schema import Table +from sqlalchemy.testing.schema import Column import sqlalchemy as sa -from test.lib import testing -from test.lib import fixtures +from sqlalchemy import testing +from sqlalchemy.testing import fixtures class BindTest(fixtures.TestBase): def test_create_drop_explicit(self): diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py index b341801eb..71379ec7e 100644 --- a/test/engine/test_ddlevents.py +++ b/test/engine/test_ddlevents.py @@ -1,16 +1,17 @@ from __future__ import with_statement -from test.lib.testing import assert_raises, assert_raises_message +from sqlalchemy.testing import assert_raises, assert_raises_message from sqlalchemy.schema import DDL, CheckConstraint, AddConstraint, \ DropConstraint from sqlalchemy import create_engine from sqlalchemy import MetaData, Integer, String, event, exc, text -from test.lib.schema import Table -from test.lib.schema import Column +from sqlalchemy.testing.schema import Table +from sqlalchemy.testing.schema import Column import sqlalchemy as tsa -from test.lib import testing, engines -from test.lib.testing import AssertsCompiledSQL, eq_ +from sqlalchemy import testing +from sqlalchemy.testing import engines +from sqlalchemy.testing import AssertsCompiledSQL, eq_ from nose import SkipTest -from test.lib import fixtures +from sqlalchemy.testing import fixtures class DDLEventTest(fixtures.TestBase): @@ -472,10 +473,10 @@ class DDLExecutionTest(fixtures.TestBase): # We're abusing the DDL() # construct here by pushing a SELECT through it - # so that we can verify the round trip. + # so that we can verify the round trip. # the DDL() will trigger autocommit, which prohibits # some DBAPIs from returning results (pyodbc), so we - # run in an explicit transaction. + # run in an explicit transaction. with testing.db.begin() as conn: eq_( conn.execute( diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index 156a9fc35..ced72f276 100644 --- a/test/engine/test_execute.py +++ b/test/engine/test_execute.py @@ -1,22 +1,23 @@ from __future__ import with_statement -from test.lib.testing import eq_, assert_raises, assert_raises_message, \ +from sqlalchemy.testing import eq_, assert_raises, assert_raises_message, \ config, is_ import re -from test.lib.util import picklers +from sqlalchemy.testing.util import picklers from sqlalchemy.interfaces import ConnectionProxy from sqlalchemy import MetaData, Integer, String, INT, VARCHAR, func, \ bindparam, select, event, TypeDecorator, create_engine, Sequence from sqlalchemy.sql import column, literal -from test.lib.schema import Table, Column +from sqlalchemy.testing.schema import Table, Column import sqlalchemy as tsa -from test.lib import testing, engines -from test.lib.engines import testing_engine +from sqlalchemy import testing +from sqlalchemy.testing import engines +from sqlalchemy.testing.engines import testing_engine import logging from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam from sqlalchemy.engine import result as _result, default from sqlalchemy.engine.base import Connection, Engine -from test.lib import fixtures +from sqlalchemy.testing import fixtures import StringIO users, metadata, users_autoinc = None, None, None diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py index a87c8d056..a00a942cb 100644 --- a/test/engine/test_parseconnect.py +++ b/test/engine/test_parseconnect.py @@ -1,4 +1,4 @@ -from test.lib.testing import assert_raises, assert_raises_message, eq_ +from sqlalchemy.testing import assert_raises, assert_raises_message, eq_ import ConfigParser import StringIO import sqlalchemy.engine.url as url @@ -6,7 +6,8 @@ from sqlalchemy import create_engine, engine_from_config, exc, pool from sqlalchemy.engine.util import _coerce_config from sqlalchemy.engine.default import DefaultDialect import sqlalchemy as tsa -from test.lib import fixtures, testing +from sqlalchemy.testing import fixtures +from sqlalchemy import testing class ParseConnectTest(fixtures.TestBase): def test_rfc1738(self): diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 6f00a3c80..d991cc7be 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -1,11 +1,11 @@ import threading, time from sqlalchemy import pool, interfaces, select, event import sqlalchemy as tsa -from test.lib import testing -from test.lib.util import gc_collect, lazy_gc -from test.lib.testing import eq_, assert_raises -from test.lib.engines import testing_engine -from test.lib import fixtures +from sqlalchemy import testing +from sqlalchemy.testing.util import gc_collect, lazy_gc +from sqlalchemy.testing import eq_, assert_raises +from sqlalchemy.testing.engines import testing_engine +from sqlalchemy.testing import fixtures mcid = 1 class MockDBAPI(object): diff --git a/test/engine/test_processors.py b/test/engine/test_processors.py index d05de6902..bc9af7305 100644 --- a/test/engine/test_processors.py +++ b/test/engine/test_processors.py @@ -1,5 +1,5 @@ -from test.lib import fixtures -from test.lib.testing import assert_raises_message, eq_ +from sqlalchemy.testing import fixtures +from sqlalchemy.testing import assert_raises_message, eq_ class _DateProcessorTest(fixtures.TestBase): diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py index 360a20eb2..6416ce149 100644 --- a/test/engine/test_reconnect.py +++ b/test/engine/test_reconnect.py @@ -1,14 +1,15 @@ -from test.lib.testing import eq_, assert_raises, assert_raises_message +from sqlalchemy.testing import eq_, assert_raises, assert_raises_message import time import weakref from sqlalchemy import select, MetaData, Integer, String, pool, create_engine -from test.lib.schema import Table, Column +from sqlalchemy.testing.schema import Table, Column import sqlalchemy as tsa -from test.lib import testing, engines -from test.lib.util import gc_collect +from sqlalchemy import testing +from sqlalchemy.testing import engines +from sqlalchemy.testing.util import gc_collect from sqlalchemy import exc -from test.lib import fixtures -from test.lib.engines import testing_engine +from sqlalchemy.testing import fixtures +from sqlalchemy.testing.engines import testing_engine class MockDisconnect(Exception): pass diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py index 2713bd80b..a909803a1 100644 --- a/test/engine/test_reflection.py +++ b/test/engine/test_reflection.py @@ -5,10 +5,11 @@ from sqlalchemy import types as sql_types from sqlalchemy import schema, events, event, inspect from sqlalchemy import MetaData, Integer, String from sqlalchemy.engine.reflection import Inspector -from test.lib import ComparesTables, \ - testing, engines, AssertsCompiledSQL, fixtures -from test.lib.schema import Table, Column -from test.lib.testing import eq_, assert_raises, assert_raises_message +from sqlalchemy.testing import ComparesTables, \ + engines, AssertsCompiledSQL, fixtures +from sqlalchemy.testing.schema import Table, Column +from sqlalchemy.testing import eq_, assert_raises, assert_raises_message +from sqlalchemy import testing metadata, users = None, None diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index 709f0d2f1..ad6813f87 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -1,15 +1,15 @@ -from test.lib.testing import eq_, assert_raises, \ +from sqlalchemy.testing import eq_, assert_raises, \ assert_raises_message, ne_ import sys import time import threading -from test.lib.engines import testing_engine +from sqlalchemy.testing.engines import testing_engine from sqlalchemy import create_engine, MetaData, INT, VARCHAR, Sequence, \ select, Integer, String, func, text, exc -from test.lib.schema import Table -from test.lib.schema import Column -from test.lib import testing -from test.lib import fixtures +from sqlalchemy.testing.schema import Table +from sqlalchemy.testing.schema import Column +from sqlalchemy import testing +from sqlalchemy.testing import fixtures users, metadata = None, None -- cgit v1.2.1