- commenting SQLSoup out of the py3k tests for now

- other py3k adjustments

diff --git a/test/base/dependency.py b/test/base/dependency.py
index b4d42d2532011ff60c0a12856b8e400b7f3c6b99..ca6b4b42e28adda0c8a940cdffd6ce9210047f88 100644 (file)
--- a/test/base/dependency.py
+++ b/test/base/dependency.py
@@ -28,7 +28,7 @@ class DependencySortTest(TestBase):
         items = set()
         def assert_unique(node):
             for item in [i for i in node[1] or [node[0]]]:
-                assert item not in items
+                assert item not in items, str(node)
                 items.add(item)
                 if item in collection:
                     collection.remove(item)

diff --git a/test/ext/alltests.py b/test/ext/alltests.py
index a1f1be60d31f60f59796cd1980371b50d10f5a03..7c8a47bef3eea55af3eada7c3df9cb416835d85d 100644 (file)
--- a/test/ext/alltests.py
+++ b/test/ext/alltests.py
@@ -17,7 +17,9 @@ def suite():
     else:
         doctest_modules = (
             ('sqlalchemy.ext.orderinglist', {'optionflags': doctest.ELLIPSIS}),
+            # Py2K
             ('sqlalchemy.ext.sqlsoup', {})
+            # end Py2K
             )
 
     alltests = unittest.TestSuite()

diff --git a/test/profiling/compiler.py b/test/profiling/compiler.py
index 78d7a711a2b11b3441aa772044835ce30a247da5..6bef57aaa8406c4f69e2e93d9a2ab2528e72c50f 100644 (file)
--- a/test/profiling/compiler.py
+++ b/test/profiling/compiler.py
@@ -15,7 +15,7 @@ class CompileTest(TestBase, AssertsExecutionResults):
             Column('c1', Integer, primary_key=True),
             Column('c2', String(30)))
 
-    @profiling.function_call_count(72, {'2.4': 42})
+    @profiling.function_call_count(72, {'2.4': 42, '3.0':77})
     def test_insert(self):
         t1.insert().compile()
 
@@ -23,7 +23,7 @@ class CompileTest(TestBase, AssertsExecutionResults):
     def test_update(self):
         t1.update().compile()
 
-    @profiling.function_call_count(195, versions={'2.4':118})
+    @profiling.function_call_count(195, versions={'2.4':118, '3.0':208})
     def test_select(self):
         s = select([t1], t1.c.c2==t2.c.c1)
         s.compile()

diff --git a/test/profiling/pool.py b/test/profiling/pool.py
index f3f69222c0eeb7efbe76e931bd06195cf42bdcd1..f75913dfa95b0c7834532bc4667fccb3b9ab0721 100644 (file)
--- a/test/profiling/pool.py
+++ b/test/profiling/pool.py
@@ -16,7 +16,7 @@ class QueuePoolTest(TestBase, AssertsExecutionResults):
                          use_threadlocal=True)
 
 
-    @profiling.function_call_count(54, {'2.4': 38})
+    @profiling.function_call_count(54, {'2.4': 38, '3.0':57})
     def test_first_connect(self):
         conn = pool.connect()
 
@@ -33,7 +33,7 @@ class QueuePoolTest(TestBase, AssertsExecutionResults):
     def test_second_samethread_connect(self):
         conn = pool.connect()
 
-        @profiling.function_call_count(5, {'2.4': 3})
+        @profiling.function_call_count(5, {'2.4': 3, '3.0':6})
         def go():
             return pool.connect()
         c2 = go()