summaryrefslogtreecommitdiff
path: root/test/engine
diff options
context:
space:
mode:
Diffstat (limited to 'test/engine')
-rw-r--r--test/engine/_base.py4
-rw-r--r--test/engine/test_bind.py8
-rw-r--r--test/engine/test_ddlevents.py10
-rw-r--r--test/engine/test_execute.py6
-rw-r--r--test/engine/test_metadata.py12
-rw-r--r--test/engine/test_parseconnect.py4
-rw-r--r--test/engine/test_pool.py6
-rw-r--r--test/engine/test_reconnect.py8
-rw-r--r--test/engine/test_reflection.py6
-rw-r--r--test/engine/test_transaction.py8
10 files changed, 36 insertions, 36 deletions
diff --git a/test/engine/_base.py b/test/engine/_base.py
index ec91243d2..773fa2fea 100644
--- a/test/engine/_base.py
+++ b/test/engine/_base.py
@@ -1,6 +1,6 @@
import sqlalchemy as sa
-from sqlalchemy.test import testing
-from sqlalchemy.test.testing import adict
+from test.lib import testing
+from test.lib.testing import adict
class TablesTest(testing.TestBase):
diff --git a/test/engine/test_bind.py b/test/engine/test_bind.py
index dfcc5e172..855c3611e 100644
--- a/test/engine/test_bind.py
+++ b/test/engine/test_bind.py
@@ -1,14 +1,14 @@
"""tests the "bind" attribute/argument across schema and SQL,
including the deprecated versions of these arguments"""
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
from sqlalchemy import engine, exc
from sqlalchemy import MetaData, ThreadLocalMetaData
from sqlalchemy import Integer, text
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
import sqlalchemy as sa
-from sqlalchemy.test import testing
+from test.lib import testing
class BindTest(testing.TestBase):
diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py
index ccbbfd82d..cc4f8b0e4 100644
--- a/test/engine/test_ddlevents.py
+++ b/test/engine/test_ddlevents.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.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
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from test.lib.schema import Table
+from test.lib.schema import Column
import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
-from sqlalchemy.test.testing import AssertsCompiledSQL
+from test.lib import TestBase, testing, engines
+from test.lib.testing import AssertsCompiledSQL
from nose import SkipTest
class DDLEventTest(TestBase):
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 116b8fc22..9b63945fb 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
import re
from sqlalchemy.interfaces import ConnectionProxy
from sqlalchemy import MetaData, Integer, String, INT, VARCHAR, func, \
bindparam, select
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
+from test.lib import TestBase, testing, engines
import logging
from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
diff --git a/test/engine/test_metadata.py b/test/engine/test_metadata.py
index b2250c808..daead42de 100644
--- a/test/engine/test_metadata.py
+++ b/test/engine/test_metadata.py
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import assert_raises
-from sqlalchemy.test.testing import assert_raises_message
-from sqlalchemy.test.testing import emits_warning
+from test.lib.testing import assert_raises
+from test.lib.testing import assert_raises_message
+from test.lib.testing import emits_warning
import pickle
from sqlalchemy import Integer, String, UniqueConstraint, \
CheckConstraint, ForeignKey, MetaData, Sequence, \
ForeignKeyConstraint, ColumnDefault, Index
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
from sqlalchemy import schema, exc
import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, ComparesTables, \
+from test.lib import TestBase, ComparesTables, \
AssertsCompiledSQL, testing, engines
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
class MetaDataTest(TestBase, ComparesTables):
def test_metadata_connect(self):
diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index 78b75ad2f..7000549e7 100644
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
+from test.lib.testing import assert_raises, assert_raises_message, eq_
import ConfigParser
import StringIO
import sqlalchemy.engine.url as url
from sqlalchemy import create_engine, engine_from_config
from sqlalchemy.engine import _coerce_config
import sqlalchemy as tsa
-from sqlalchemy.test import TestBase
+from test.lib import TestBase
class ParseConnectTest(TestBase):
diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
index 9db65d2ab..a278b563a 100644
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@ -1,9 +1,9 @@
import threading, time
from sqlalchemy import pool, interfaces, create_engine, select
import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing
-from sqlalchemy.test.util import gc_collect, lazy_gc
-from sqlalchemy.test.testing import eq_
+from test.lib import TestBase, testing
+from test.lib.util import gc_collect, lazy_gc
+from test.lib.testing import eq_
mcid = 1
class MockDBAPI(object):
diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py
index e26413957..7130b6b4f 100644
--- a/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_, assert_raises
+from test.lib.testing import eq_, assert_raises
import time
import weakref
from sqlalchemy import select, MetaData, Integer, String, pool
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
import sqlalchemy as tsa
-from sqlalchemy.test import TestBase, testing, engines
-from sqlalchemy.test.util import gc_collect
+from test.lib import TestBase, testing, engines
+from test.lib.util import gc_collect
from sqlalchemy import exc
class MockDisconnect(Exception):
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index d0d6e31e1..cd1138985 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -1,12 +1,12 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
import StringIO, unicodedata
from sqlalchemy import types as sql_types
from sqlalchemy import schema
from sqlalchemy.engine.reflection import Inspector
from sqlalchemy import MetaData
-from sqlalchemy.test.schema import Table, Column
+from test.lib.schema import Table, Column
import sqlalchemy as sa
-from sqlalchemy.test import TestBase, ComparesTables, \
+from test.lib import TestBase, ComparesTables, \
testing, engines, AssertsCompiledSQL
create_inspector = Inspector.from_engine
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index f09c67164..c21fc9642 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
assert_raises_message
import sys
import time
import threading
from sqlalchemy import create_engine, MetaData, INT, VARCHAR, Sequence, \
select, Integer, String, func, text, exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
-from sqlalchemy.test import TestBase, testing
+from test.lib.schema import Table
+from test.lib.schema import Column
+from test.lib import TestBase, testing
users, metadata = None, None
View Lorry Controller Status