diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-03 18:43:28 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-03 18:43:28 -0500 |
| commit | 2469b651e61066dd63a0c60d7eeb7cfce16c2ee5 (patch) | |
| tree | 9f19076e861e6d7c06c7c95d41447d1595fb96b2 | |
| parent | 66470d8656a7bc60c6f2888670809ea67c1beab5 (diff) | |
| download | sqlalchemy-2469b651e61066dd63a0c60d7eeb7cfce16c2ee5.tar.gz | |
fix the profiling ids here
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/pytestplugin.py | 4 | ||||
| -rw-r--r-- | test/profiles.txt | 32 |
2 files changed, 9 insertions, 27 deletions
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index 352cbbd5f..c51768567 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -112,7 +112,9 @@ def pytest_runtest_teardown(item): test_teardown(item) def test_setup(item): - id_ = "%s.%s:%s" % (item.parent.module.__name__, item.parent.name, item.name) + # 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) plugin_base.before_test(item, id_) def test_teardown(item): diff --git a/test/profiles.txt b/test/profiles.txt index 79f349874..cee0c5a6a 100644 --- a/test/profiles.txt +++ b/test/profiles.txt @@ -1,15 +1,15 @@ # /Users/classic/dev/sqlalchemy/test/profiles.txt # This file is written out on a per-environment basis. -# For each test in aaa_profiling, the corresponding function and +# For each test in aaa_profiling, the corresponding function and # environment is located within this file. If it doesn't exist, # the test is skipped. -# If a callcount does exist, it is compared to what we received. +# If a callcount does exist, it is compared to what we received. # assertions are raised if the counts do not match. -# -# To add a new callcount test, apply the function_call_count -# decorator and re-run the tests using the --write-profiles +# +# To add a new callcount test, apply the function_call_count +# decorator and re-run the tests using the --write-profiles # option - this file will be rewritten including the new count. -# +# # TEST: test.aaa_profiling.test_compiler.CompileTest.test_insert @@ -99,26 +99,6 @@ test.aaa_profiling.test_compiler.CompileTest.test_update_whereclause 3.3_postgre test.aaa_profiling.test_compiler.CompileTest.test_update_whereclause 3.3_postgresql_psycopg2_nocextensions 151 test.aaa_profiling.test_compiler.CompileTest.test_update_whereclause 3.3_sqlite_pysqlite_cextensions 151 -# TEST: test.aaa_profiling.test_compiler.CompileTest:test_insert - -test.aaa_profiling.test_compiler.CompileTest:test_insert 2.7_sqlite_pysqlite_cextensions 73 - -# TEST: test.aaa_profiling.test_compiler.CompileTest:test_select - -test.aaa_profiling.test_compiler.CompileTest:test_select 2.7_sqlite_pysqlite_cextensions 145 - -# TEST: test.aaa_profiling.test_compiler.CompileTest:test_select_labels - -test.aaa_profiling.test_compiler.CompileTest:test_select_labels 2.7_sqlite_pysqlite_cextensions 179 - -# TEST: test.aaa_profiling.test_compiler.CompileTest:test_update - -test.aaa_profiling.test_compiler.CompileTest:test_update 2.7_sqlite_pysqlite_cextensions 78 - -# TEST: test.aaa_profiling.test_compiler.CompileTest:test_update_whereclause - -test.aaa_profiling.test_compiler.CompileTest:test_update_whereclause 2.7_sqlite_pysqlite_cextensions 147 - # TEST: test.aaa_profiling.test_orm.AttributeOverheadTest.test_attribute_set test.aaa_profiling.test_orm.AttributeOverheadTest.test_attribute_set 2.7_sqlite_pysqlite_cextensions 4265 |