- Removed @unsupported

4 files changed, 32 insertions, 32 deletions

diff --git a/test/sql/defaults.py b/test/sql/defaults.py
index dafab1fd0..8beb016ab 100644
--- a/test/sql/defaults.py
+++ b/test/sql/defaults.py
@@ -385,7 +385,7 @@ class PKDefaultTest(TestBase):
     def tearDownAll(self):
         metadata.drop_all()
 
-    @testing.unsupported('mssql', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('mssql', 'FIXME: unknown, verify not fails_on')
     def test_basic(self):
         t2.insert().execute(nextid=1)
         r = t1.insert().execute(data='hi')
diff --git a/test/sql/query.py b/test/sql/query.py
index 098e709b2..2dad9c695 100644
--- a/test/sql/query.py
+++ b/test/sql/query.py
@@ -296,7 +296,7 @@ class QueryTest(TestBase):
         r = users.select(limit=3, order_by=[users.c.user_id]).execute().fetchall()
         self.assert_(r == [(1, 'john'), (2, 'jack'), (3, 'ed')], repr(r))
 
-    @testing.unsupported('mssql', 'FIXME: guessing')
+    @testing.crashes('mssql', 'FIXME: guessing')
     @testing.fails_on('maxdb')
     def test_select_limit_offset(self):
         users.insert().execute(user_id=1, user_name='john')
@@ -492,9 +492,9 @@ class QueryTest(TestBase):
         self.assertEqual([x.lower() for x in r.keys()], ['user_name', 'user_id'])
         self.assertEqual(r.values(), ['foo', 1])
 
-    @testing.unsupported('oracle', 'FIXME: unknown, varify not fails_on()')
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on()')
-    @testing.unsupported('maxdb', 'FIXME: unknown, verify not fails_on()')
+    @testing.crashes('oracle', 'FIXME: unknown, varify not fails_on()')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on()')
+    @testing.crashes('maxdb', 'FIXME: unknown, verify not fails_on()')
     def test_column_accessor_shadow(self):
         meta = MetaData(testing.db)
         shadowed = Table('test_shadowed', meta,
@@ -668,7 +668,7 @@ class CompoundTest(TestBase):
                   ('ccc', 'aaa')]
         self.assertEquals(u.alias('bar').select().execute().fetchall(), wanted)
 
-    @testing.unsupported('oracle', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('oracle', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     @testing.fails_on('sqlite')
     def test_union_all(self):
@@ -687,8 +687,8 @@ class CompoundTest(TestBase):
         found2 = self._fetchall_sorted(e.alias('foo').select().execute())
         self.assertEquals(found2, wanted)
 
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('sybase', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('sybase', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     def test_intersect(self):
         i = intersect(
@@ -704,9 +704,9 @@ class CompoundTest(TestBase):
         found2 = self._fetchall_sorted(i.alias('bar').select().execute())
         self.assertEquals(found2, wanted)
 
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('oracle', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('sybase', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('oracle', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('sybase', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     def test_except_style1(self):
         e = except_(union(
@@ -721,9 +721,9 @@ class CompoundTest(TestBase):
         found = self._fetchall_sorted(e.alias('bar').select().execute())
         self.assertEquals(found, wanted)
 
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('oracle', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('sybase', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('oracle', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('sybase', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     def test_except_style2(self):
         e = except_(union(
@@ -741,9 +741,9 @@ class CompoundTest(TestBase):
         found2 = self._fetchall_sorted(e.alias('bar').select().execute())
         self.assertEquals(found2, wanted)
 
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('oracle', 'FIXME: unknown, verify not fails_on')
-    @testing.unsupported('sybase', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('oracle', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('sybase', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     @testing.fails_on('sqlite')
     def test_except_style3(self):
@@ -759,7 +759,7 @@ class CompoundTest(TestBase):
         self.assertEquals(e.alias('foo').select().execute().fetchall(),
                           [('ccc',)])
 
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     def test_composite(self):
         u = intersect(
@@ -775,7 +775,7 @@ class CompoundTest(TestBase):
 
         self.assertEquals(found, wanted)
 
-    @testing.unsupported('firebird', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('firebird', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('mysql')
     def test_composite_alias(self):
         ua = intersect(
diff --git a/test/sql/quote.py b/test/sql/quote.py
index 2e5910c7b..7003ce834 100644
--- a/test/sql/quote.py
+++ b/test/sql/quote.py
@@ -4,11 +4,12 @@ from sqlalchemy import sql
 from sqlalchemy.sql import compiler
 from testlib import *
 
+
 class QuoteTest(TestBase, AssertsCompiledSQL):
     def setUpAll(self):
-        # TODO: figure out which databases/which identifiers allow special characters to be used,
-        # such as:  spaces, quote characters, punctuation characters, set up tests for those as
-        # well.
+        # TODO: figure out which databases/which identifiers allow special
+        # characters to be used, such as: spaces, quote characters,
+        # punctuation characters, set up tests for those as well.
         global table1, table2, table3
         metadata = MetaData(testing.db)
         table1 = Table('WorstCase1', metadata,
@@ -67,24 +68,24 @@ class QuoteTest(TestBase, AssertsCompiledSQL):
         res2 = select([table2.c.d123, table2.c.u123, table2.c.MixedCase], use_labels=True).execute().fetchall()
         print res2
         assert(res2==[(1,2,3),(2,2,3),(4,3,2)])
-    
+
     def test_quote_flag(self):
         metadata = MetaData()
-        t1 = Table('TableOne', metadata, 
+        t1 = Table('TableOne', metadata,
             Column('ColumnOne', Integer), schema="FooBar")
         self.assert_compile(t1.select(), '''SELECT "FooBar"."TableOne"."ColumnOne" FROM "FooBar"."TableOne"''')
 
         metadata = MetaData()
-        t1 = Table('t1', metadata, 
+        t1 = Table('t1', metadata,
             Column('col1', Integer, quote=True), quote=True, schema="foo", quote_schema=True)
         self.assert_compile(t1.select(), '''SELECT "foo"."t1"."col1" FROM "foo"."t1"''')
 
         metadata = MetaData()
-        t1 = Table('TableOne', metadata, 
+        t1 = Table('TableOne', metadata,
             Column('ColumnOne', Integer, quote=False), quote=False, schema="FooBar", quote_schema=False)
         self.assert_compile(t1.select(), '''SELECT FooBar.TableOne.ColumnOne FROM FooBar.TableOne''')
-        
-    @testing.unsupported('oracle', 'FIXME: unknown, verify not fails_on')
+
+    @testing.crashes('oracle', 'FIXME: unknown, verify not fails_on')
     @testing.requires.subqueries
     def testlabels(self):
         """test the quoting of labels.
@@ -109,12 +110,12 @@ class QuoteTest(TestBase, AssertsCompiledSQL):
         # note that 'foo' and 'FooCol' are literals already quoted
         x = select([sql.literal_column("'foo'").label("somelabel")], from_obj=[table]).alias("AnAlias")
         x = x.select()
-        self.assert_compile(x, 
+        self.assert_compile(x,
             '''SELECT "AnAlias".somelabel FROM (SELECT 'foo' AS somelabel FROM "ImATable") AS "AnAlias"''')
 
         x = select([sql.literal_column("'FooCol'").label("SomeLabel")], from_obj=[table])
         x = x.select()
-        self.assert_compile(x, 
+        self.assert_compile(x,
             '''SELECT "SomeLabel" FROM (SELECT 'FooCol' AS "SomeLabel" FROM "ImATable")''')
 
 
diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py
index 3e9f1d631..56bd61499 100644
--- a/test/sql/testtypes.py
+++ b/test/sql/testtypes.py
@@ -8,7 +8,6 @@ from sqlalchemy.databases import mssql, oracle, mysql, postgres, firebird
 from testlib import *
 
 
-
 class AdaptTest(TestBase):
     def testadapt(self):
         e1 = url.URL('postgres').get_dialect()()
@@ -381,7 +380,7 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
             testing.db.engine.dialect.convert_unicode = prev_unicode
             testing.db.engine.dialect.convert_unicode = prev_assert
 
-    @testing.unsupported('oracle', 'FIXME: unknown, verify not fails_on')
+    @testing.crashes('oracle', 'FIXME: unknown, verify not fails_on')
     @testing.fails_on('firebird') # "Data type unknown" on the parameter
     def testlength(self):
         """checks the database correctly understands the length of a unicode string"""