diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-26 20:43:20 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-26 20:43:20 -0400 |
| commit | b6411ee3cfe63d461b73e9aa8e69c6c550ddb649 (patch) | |
| tree | 31383e4e82be67b833cae67399361a780927b82a | |
| parent | bd86942b058681fbe87f7315dc9fa69642159506 (diff) | |
| download | sqlalchemy-b6411ee3cfe63d461b73e9aa8e69c6c550ddb649.tar.gz | |
fixes to get profiling tests working again
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/pytestplugin.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/profiling.py | 2 | ||||
| -rw-r--r-- | test/aaa_profiling/test_orm.py | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index ceb6963ed..f38c7ea6a 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -114,7 +114,13 @@ def pytest_runtest_teardown(item): def test_setup(item): # like a nose id, e.g.: # "test.aaa_profiling.test_compiler.CompileTest.test_update_whereclause" - id_ = "%s.%s.%s" % (item.parent.module.__name__, item.parent.cls.__name__, item.name) + name = item.parent.cls.__name__ + + suffix = "_%s_%s" % (plugin_base.config.db.name, plugin_base.config.db.driver) + if name.endswith(suffix): + name = name[0:-(len(suffix))] + + id_ = "%s.%s.%s" % (item.parent.module.__name__, name, item.name) plugin_base.before_test(item, id_) def test_teardown(item): diff --git a/lib/sqlalchemy/testing/profiling.py b/lib/sqlalchemy/testing/profiling.py index 021218c34..2f92527e9 100644 --- a/lib/sqlalchemy/testing/profiling.py +++ b/lib/sqlalchemy/testing/profiling.py @@ -111,7 +111,7 @@ class ProfileStatsFile(object): # etc. self._write() - @util.memoized_property + @property def platform_key(self): dbapi_key = config.db.name + "_" + config.db.driver diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py index ff55b1c26..db756fe8b 100644 --- a/test/aaa_profiling/test_orm.py +++ b/test/aaa_profiling/test_orm.py @@ -10,7 +10,6 @@ from sqlalchemy.testing.schema import Table, Column import sys class MergeTest(fixtures.MappedTest): - __backend__ = True @classmethod def define_tables(cls, metadata): @@ -105,7 +104,6 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest): to load 1000 related objects from the identity map. """ - __backend__ = True @classmethod @@ -260,7 +258,6 @@ class MergeBackrefsTest(fixtures.MappedTest): s.merge(a) class DeferOptionsTest(fixtures.MappedTest): - __backend__ = True @classmethod def define_tables(cls, metadata): @@ -316,7 +313,6 @@ class DeferOptionsTest(fixtures.MappedTest): class AttributeOverheadTest(fixtures.MappedTest): - __backend__ = True @classmethod def define_tables(cls, metadata): |