merging 0.4 branch to trunk. see CHANGES for details. 0.3 moves to maintenance branch in branches/rel_0_3.

1 files changed, 6 insertions, 11 deletions

diff --git a/test/engine/execute.py b/test/engine/execute.py
index 283006cfa..3d3b43f9b 100644
--- a/test/engine/execute.py
+++ b/test/engine/execute.py
@@ -1,19 +1,14 @@
-
 import testbase
-import unittest, sys, datetime
-import tables
-db = testbase.db
 from sqlalchemy import *
+from testlib import *
 
-
-class ExecuteTest(testbase.PersistTest):
+class ExecuteTest(PersistTest):
     def setUpAll(self):
         global users, metadata
         metadata = MetaData(testbase.db)
         users = Table('users', metadata,
             Column('user_id', INT, primary_key = True),
             Column('user_name', VARCHAR(20)),
-            mysql_engine='InnoDB'
         )
         metadata.create_all()
     
@@ -22,7 +17,7 @@ class ExecuteTest(testbase.PersistTest):
     def tearDownAll(self):
         metadata.drop_all()
         
-    @testbase.supported('sqlite')
+    @testing.supported('sqlite')
     def test_raw_qmark(self):
         for conn in (testbase.db, testbase.db.connect()):
             conn.execute("insert into users (user_id, user_name) values (?, ?)", (1,"jack"))
@@ -34,7 +29,7 @@ class ExecuteTest(testbase.PersistTest):
             assert res.fetchall() == [(1, "jack"), (2, "fred"), (3, "ed"), (4, "horse"), (5, "barney"), (6, "donkey"), (7, 'sally')]
             conn.execute("delete from users")
 
-    @testbase.supported('mysql', 'postgres')
+    @testing.supported('mysql', 'postgres')
     def test_raw_sprintf(self):
         for conn in (testbase.db, testbase.db.connect()):
             conn.execute("insert into users (user_id, user_name) values (%s, %s)", [1,"jack"])
@@ -47,7 +42,7 @@ class ExecuteTest(testbase.PersistTest):
 
     # pyformat is supported for mysql, but skipping because a few driver
     # versions have a bug that bombs out on this test. (1.2.2b3, 1.2.2c1, 1.2.2)
-    @testbase.supported('postgres')
+    @testing.supported('postgres')
     def test_raw_python(self):
         for conn in (testbase.db, testbase.db.connect()):
             conn.execute("insert into users (user_id, user_name) values (%(id)s, %(name)s)", {'id':1, 'name':'jack'})
@@ -57,7 +52,7 @@ class ExecuteTest(testbase.PersistTest):
             assert res.fetchall() == [(1, "jack"), (2, "ed"), (3, "horse"), (4, 'sally')]
             conn.execute("delete from users")
 
-    @testbase.supported('sqlite')
+    @testing.supported('sqlite')
     def test_raw_named(self):
         for conn in (testbase.db, testbase.db.connect()):
             conn.execute("insert into users (user_id, user_name) values (:id, :name)", {'id':1, 'name':'jack'})