summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/suite
diff options
context:
space:
mode:
authorDiana Clarke <diana.joan.clarke@gmail.com>2012-11-19 20:19:39 -0500
committerDiana Clarke <diana.joan.clarke@gmail.com>2012-11-19 20:19:39 -0500
commitffb2107703ac4f9463625ddf46adbf52c4029a98 (patch)
tree64d0306b9f556b4a10a64e74b2f966301017127a /lib/sqlalchemy/testing/suite
parent77d5317947e1c54a25ab6c8eaf7f23bc546bd2d9 (diff)
downloadsqlalchemy-ffb2107703ac4f9463625ddf46adbf52c4029a98.tar.gz
just a pep8 pass of lib/sqlalchemy/testing/
Diffstat (limited to 'lib/sqlalchemy/testing/suite')
-rw-r--r--lib/sqlalchemy/testing/suite/test_ddl.py4
-rw-r--r--lib/sqlalchemy/testing/suite/test_insert.py5
-rw-r--r--lib/sqlalchemy/testing/suite/test_reflection.py4
-rw-r--r--lib/sqlalchemy/testing/suite/test_types.py16
-rw-r--r--lib/sqlalchemy/testing/suite/test_update_delete.py6
5 files changed, 19 insertions, 16 deletions
diff --git a/lib/sqlalchemy/testing/suite/test_ddl.py b/lib/sqlalchemy/testing/suite/test_ddl.py
index 466429aa5..c5b162413 100644
--- a/lib/sqlalchemy/testing/suite/test_ddl.py
+++ b/lib/sqlalchemy/testing/suite/test_ddl.py
@@ -25,7 +25,6 @@ class TableDDLTest(fixtures.TestBase):
(1, 'some data')
)
-
@requirements.create_table
@util.provide_metadata
def test_create_table(self):
@@ -35,7 +34,6 @@ class TableDDLTest(fixtures.TestBase):
)
self._simple_roundtrip()
-
@requirements.drop_table
@util.provide_metadata
def test_drop_table(self):
@@ -48,4 +46,4 @@ class TableDDLTest(fixtures.TestBase):
)
-__all__ = ('TableDDLTest', ) \ No newline at end of file
+__all__ = ('TableDDLTest', )
diff --git a/lib/sqlalchemy/testing/suite/test_insert.py b/lib/sqlalchemy/testing/suite/test_insert.py
index 3cd7d39bc..b2b2a0aa8 100644
--- a/lib/sqlalchemy/testing/suite/test_insert.py
+++ b/lib/sqlalchemy/testing/suite/test_insert.py
@@ -8,6 +8,7 @@ from sqlalchemy import Integer, String, select, util
from ..schema import Table, Column
+
class LastrowidTest(fixtures.TablesTest):
run_deletes = 'each'
@@ -88,7 +89,6 @@ class InsertBehaviorTest(fixtures.TablesTest):
else:
engine = config.db
-
r = engine.execute(
self.tables.autoinc_pk.insert(),
data="some data"
@@ -107,6 +107,7 @@ class InsertBehaviorTest(fixtures.TablesTest):
assert r.is_insert
assert not r.returns_rows
+
class ReturningTest(fixtures.TablesTest):
run_deletes = 'each'
__requires__ = 'returning', 'autoincrement_insert'
@@ -162,5 +163,3 @@ class ReturningTest(fixtures.TablesTest):
__all__ = ('LastrowidTest', 'InsertBehaviorTest', 'ReturningTest')
-
-
diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py
index a7c814db7..b9894347a 100644
--- a/lib/sqlalchemy/testing/suite/test_reflection.py
+++ b/lib/sqlalchemy/testing/suite/test_reflection.py
@@ -18,6 +18,7 @@ from sqlalchemy import event
metadata, users = None, None
+
class HasTableTest(fixtures.TablesTest):
@classmethod
def define_tables(cls, metadata):
@@ -31,6 +32,7 @@ class HasTableTest(fixtures.TablesTest):
assert config.db.dialect.has_table(conn, "test_table")
assert not config.db.dialect.has_table(conn, "nonexistent_table")
+
class HasSequenceTest(fixtures.TestBase):
__requires__ = 'sequences',
@@ -425,4 +427,4 @@ class ComponentReflectionTest(fixtures.TablesTest):
self._test_get_table_oid('users', schema='test_schema')
-__all__ = ('ComponentReflectionTest', 'HasSequenceTest', 'HasTableTest') \ No newline at end of file
+__all__ = ('ComponentReflectionTest', 'HasSequenceTest', 'HasTableTest')
diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py
index 74cb52c6e..8d0500d71 100644
--- a/lib/sqlalchemy/testing/suite/test_types.py
+++ b/lib/sqlalchemy/testing/suite/test_types.py
@@ -8,6 +8,7 @@ from sqlalchemy import Date, DateTime, Time, MetaData, String
from ..schema import Table, Column
import datetime
+
class _UnicodeFixture(object):
__requires__ = 'unicode_data',
@@ -70,7 +71,6 @@ class _UnicodeFixture(object):
for row in rows:
assert isinstance(row[0], unicode)
-
def _test_empty_strings(self):
unicode_table = self.tables.unicode_table
@@ -83,16 +83,17 @@ class _UnicodeFixture(object):
).first()
eq_(row, (u'',))
+
class UnicodeVarcharTest(_UnicodeFixture, fixtures.TablesTest):
__requires__ = 'unicode_data',
datatype = Unicode(255)
-
@requirements.empty_strings_varchar
def test_empty_strings_varchar(self):
self._test_empty_strings()
+
class UnicodeTextTest(_UnicodeFixture, fixtures.TablesTest):
__requires__ = 'unicode_data', 'text_type'
@@ -114,6 +115,7 @@ class StringTest(fixtures.TestBase):
foo.create(config.db)
foo.drop(config.db)
+
class _DateFixture(object):
compare = None
@@ -165,37 +167,44 @@ class DateTimeTest(_DateFixture, fixtures.TablesTest):
datatype = DateTime
data = datetime.datetime(2012, 10, 15, 12, 57, 18)
+
class DateTimeMicrosecondsTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'datetime_microseconds',
datatype = DateTime
data = datetime.datetime(2012, 10, 15, 12, 57, 18, 396)
+
class TimeTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'time',
datatype = Time
data = datetime.time(12, 57, 18)
+
class TimeMicrosecondsTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'time_microseconds',
datatype = Time
data = datetime.time(12, 57, 18, 396)
+
class DateTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'date',
datatype = Date
data = datetime.date(2012, 10, 15)
+
class DateTimeCoercedToDateTimeTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'date',
datatype = Date
data = datetime.datetime(2012, 10, 15, 12, 57, 18)
compare = datetime.date(2012, 10, 15)
+
class DateTimeHistoricTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'datetime_historic',
datatype = DateTime
data = datetime.datetime(1850, 11, 10, 11, 52, 35)
+
class DateHistoricTest(_DateFixture, fixtures.TablesTest):
__requires__ = 'date_historic',
datatype = Date
@@ -207,6 +216,3 @@ __all__ = ('UnicodeVarcharTest', 'UnicodeTextTest',
'DateTimeHistoricTest', 'DateTimeCoercedToDateTimeTest',
'TimeMicrosecondsTest', 'TimeTest', 'DateTimeMicrosecondsTest',
'DateHistoricTest', 'StringTest')
-
-
-
diff --git a/lib/sqlalchemy/testing/suite/test_update_delete.py b/lib/sqlalchemy/testing/suite/test_update_delete.py
index e73b05485..a3456ac2a 100644
--- a/lib/sqlalchemy/testing/suite/test_update_delete.py
+++ b/lib/sqlalchemy/testing/suite/test_update_delete.py
@@ -1,9 +1,7 @@
from .. import fixtures, config
-from ..config import requirements
from ..assertions import eq_
-from .. import engines
-from sqlalchemy import Integer, String, select
+from sqlalchemy import Integer, String
from ..schema import Table, Column
@@ -61,4 +59,4 @@ class SimpleUpdateDeleteTest(fixtures.TablesTest):
]
)
-__all__ = ('SimpleUpdateDeleteTest', ) \ No newline at end of file
+__all__ = ('SimpleUpdateDeleteTest', )