mark all aaa_profiling tests with __requires__ = 'cpython',

diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py
index f68e82b0734b72c5d37f325e687da05ff5b27054..f949ce6ead739f20e722467d9e2ea25e1e23f243 100644 (file)
--- a/test/aaa_profiling/test_compiler.py
+++ b/test/aaa_profiling/test_compiler.py
@@ -3,6 +3,8 @@ from test.lib import *
 from sqlalchemy.engine import default
 
 class CompileTest(fixtures.TestBase, AssertsExecutionResults):
+    __requires__ = 'cpython',
+
     @classmethod
     def setup_class(cls):
 

diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py
index 80939376ca66845c4402f90f260640486ffc297b..0cbe126b436cb7570b63aafc726692bcceedc2fb 100644 (file)
--- a/test/aaa_profiling/test_memusage.py
+++ b/test/aaa_profiling/test_memusage.py
@@ -3,7 +3,6 @@ from sqlalchemy.orm import mapper, relationship, create_session, \
     clear_mappers, sessionmaker, class_mapper
 from sqlalchemy.orm.mapper import _mapper_registry
 from sqlalchemy.orm.session import _sessions
-from sqlalchemy.util import jython
 import operator
 from test.lib import testing, engines
 from sqlalchemy import MetaData, Integer, String, ForeignKey, \
@@ -19,11 +18,6 @@ import gc
 import weakref
 from test.lib import fixtures
 
-if jython:
-    from nose import SkipTest
-    raise SkipTest("Profiling not supported on this platform")
-
-
 class A(fixtures.ComparableEntity):
     pass
 class B(fixtures.ComparableEntity):
@@ -75,6 +69,8 @@ class EnsureZeroed(fixtures.ORMTest):
 
 class MemUsageTest(EnsureZeroed):
 
+    __requires__ = 'cpython',
+
     # ensure a pure growing test trips the assertion
     @testing.fails_if(lambda: True)
     def test_fixture(self):

diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index 25e84b9f3db48a7c6cd429462cb18588e3eb25d1..24a687f1c398a151854d9dcca821ef06c67e06cc 100644 (file)
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -10,6 +10,8 @@ import sys
 
 class MergeTest(fixtures.MappedTest):
 
+    __requires__ = 'cpython',
+
     @classmethod
     def define_tables(cls, metadata):
         parent = Table('parent', metadata, Column('id', Integer,
@@ -115,7 +117,7 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
     # count here,
     # so remove some platforms that have wildly divergent
     # callcounts.
-    __requires__ = 'python25',
+    __requires__ = 'python25', 'cpython'
     __unsupported_on__ = 'postgresql+pg8000', 'mysql+pymysql'
 
     @classmethod

diff --git a/test/aaa_profiling/test_pool.py b/test/aaa_profiling/test_pool.py
index 35f6b71f930baa736142c0c022eb142014797162..1077a78b7c378cd95cd061794ad10b70aeb17917 100644 (file)
--- a/test/aaa_profiling/test_pool.py
+++ b/test/aaa_profiling/test_pool.py
@@ -4,6 +4,8 @@ from sqlalchemy.pool import QueuePool
 from sqlalchemy import pool as pool_module
 
 class QueuePoolTest(fixtures.TestBase, AssertsExecutionResults):
+    __requires__ = 'cpython', 
+
     class Connection(object):
         def rollback(self):
             pass

diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py
index 9ba3d69175f1ef4ec9f25c359cc5b3ad378ac865..e2c6ecd500c26ee233b513763d4ece57fc4e2f0a 100644 (file)
--- a/test/aaa_profiling/test_resultset.py
+++ b/test/aaa_profiling/test_resultset.py
@@ -5,7 +5,7 @@ NUM_RECORDS = 1000
 
 
 class ResultSetTest(fixtures.TestBase, AssertsExecutionResults):
-
+    __requires__ = 'cpython',
     __only_on__ = 'sqlite'
 
     @classmethod
@@ -53,6 +53,7 @@ class ResultSetTest(fixtures.TestBase, AssertsExecutionResults):
         [tuple(row) for row in t2.select().execute().fetchall()]
 
 class ExecutionTest(fixtures.TestBase):
+    __requires__ = 'cpython',
     __only_on__ = 'sqlite'
 
     def test_minimal_connection_execute(self):

diff --git a/test/lib/requires.py b/test/lib/requires.py
index 5f3eb1c9aca37be4e527c6a2f445ce9c3abd78e3..44ba6ffac21a99398444dba1bdc2aeafd72b8057 100644 (file)
--- a/test/lib/requires.py
+++ b/test/lib/requires.py
@@ -346,6 +346,14 @@ def python25(fn):
         )
     )
 
+def cpython(fn):
+    return _chain_decorators_on(
+         fn,
+         skip_if(lambda: util.jython or util.pypy, 
+           "cPython interpreter needed"
+         )
+    )
+
 def _has_cextensions():
     try:
         from sqlalchemy import cresultproxy, cprocessors