Commits

Mike Bayer committed 5c3cab9

fix some tests

  • Participants
  • Parent commits cf6360f

Comments (0)

Files changed (2)

test/dialect/test_postgresql.py

     def test_expression_pyformat(self):
         self.assert_compile(matchtable.c.title.match('somstr'),
                             'matchtable.title @@ to_tsquery(%(title_1)s'
-                            ')')
+                            ')',
+                            dialect=postgresql.dialect())
 
     @testing.fails_on('postgresql+psycopg2', 'uses pyformat')
     @testing.fails_on('postgresql+pypostgresql', 'uses pyformat')
     @testing.fails_on('postgresql+zxjdbc', 'uses qmark')
     def test_expression_positional(self):
         self.assert_compile(matchtable.c.title.match('somstr'),
-                            'matchtable.title @@ to_tsquery(%s)')
+                            'matchtable.title @@ to_tsquery(%s)',
+                            dialect=postgresql.dialect())
 
     def test_simple_match(self):
         results = \

test/engine/test_bind.py

 """tests the "bind" attribute/argument across schema and SQL,
 including the deprecated versions of these arguments"""
 
-from test.lib.testing import eq_
+from test.lib.testing import eq_, assert_raises
 from sqlalchemy import engine, exc
 from sqlalchemy import MetaData, ThreadLocalMetaData
 from sqlalchemy import Integer, text
                         if isinstance(bind, engine.Connection):
                             bind.close()
 
-                try:
-                    e = elem()
-                    assert e.bind is None
-                    e.execute()
-                    assert False
-                except exc.UnboundExecutionError, e:
-                    assert str(e).endswith('is not bound and does not '
-                            'support direct execution. Supply this '
-                            'statement to a Connection or Engine for '
-                            'execution. Or, assign a bind to the '
-                            'statement or the Metadata of its '
-                            'underlying tables to enable implicit '
-                            'execution via this method.')
+                e = elem()
+                assert e.bind is None
+                assert_raises(
+                    exc.UnboundExecutionError,
+                    e.execute
+                )
         finally:
             if isinstance(bind, engine.Connection):
                 bind.close()