From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Feb 2011 04:37:15 +0000 (-0500)
Subject: fix some tests
X-Git-Tag: rel_0_7b1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134a4cb3a6f4ee0e2c2865d97cf20f829b29f162;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix some tests
---

diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py
index 5d67e19216..424e8b5d9c 100644
--- a/test/dialect/test_postgresql.py
+++ b/test/dialect/test_postgresql.py
@@ -2094,14 +2094,16 @@ class MatchTest(TestBase, AssertsCompiledSQL):
     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 = \
diff --git a/test/engine/test_bind.py b/test/engine/test_bind.py
index 855c3611e9..0ef70c2448 100644
--- a/test/engine/test_bind.py
+++ b/test/engine/test_bind.py
@@ -1,7 +1,7 @@
 """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
@@ -177,19 +177,12 @@ class BindTest(testing.TestBase):
                         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()