- updated the naming scheme of the base test classes in test/testlib/testing.py;

tests extend from either TestBase or ORMTest, using additional mixins for
special assertion methods as needed

3 files changed, 5 insertions, 6 deletions

diff --git a/test/profiling/compiler.py b/test/profiling/compiler.py
index 330271a1c..51ec25e38 100644
--- a/test/profiling/compiler.py
+++ b/test/profiling/compiler.py
@@ -3,7 +3,7 @@ from sqlalchemy import *
 from testlib import *
 
 
-class CompileTest(AssertMixin):
+class CompileTest(TestBase, AssertsExecutionResults):
     def setUpAll(self):
         global t1, t2, metadata
         metadata = MetaData()
diff --git a/test/profiling/pool.py b/test/profiling/pool.py
index 92c488382..a8167a1ba 100644
--- a/test/profiling/pool.py
+++ b/test/profiling/pool.py
@@ -4,7 +4,7 @@ from testlib import *
 from sqlalchemy.pool import QueuePool
 from sqlalchemy.databases import sqlite
 
-class QueuePoolTest(AssertMixin):
+class QueuePoolTest(TestBase, AssertsExecutionResults):
     def setUp(self):
         global pool
         pool = QueuePool(creator = lambda: sqlite.SQLiteDialect.dbapi().connect(':memory:'), pool_size = 3, max_overflow = -1, use_threadlocal = True)
diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index f78036123..f0208acb4 100644
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -7,16 +7,15 @@ import datetime
 import sys
 import time
 import testenv; testenv.configure_for_tests()
-from testlib import engines, testing, profiling
 from sqlalchemy import *
-from testlib import set
+from testlib import *
 
 ITERATIONS = 1
 
 _run_type = 'suite'
 _running_in = lambda: _run_type
 
-class ZooMarkTest(testing.AssertMixin):
+class ZooMarkTest(testing.TestBase, AssertsExecutionResults):
     """Runs the ZooMark and squawks if method counts vary from the norm.
 
     Each test has an associated `call_range`, the total number of accepted
@@ -29,7 +28,7 @@ class ZooMarkTest(testing.AssertMixin):
 
     @profiling.conditional_call_count(
         _running_in, {'isolation': (1806,),
-                      'suite': (1569, {'2.4': 1579})})
+                      'suite': (1569, {'2.4': 1579}, 0.20)})
     def test_1_create_tables(self):
         global metadata
         metadata = MetaData(testing.db)