updates

6 files changed, 29 insertions, 3 deletions

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index a9d5a69b1..453a6ce9f 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -3021,7 +3021,7 @@ class MetaData(SchemaItem):
 
         self.bind = bind
         if reflect:
-            util.warn("reflect=True is deprecate; please "
+            util.warn_deprecated("reflect=True is deprecate; please "
                             "use the reflect() method.")
             if not bind:
                 raise exc.ArgumentError(
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
index 943ef6a66..1c0f0fcda 100644
--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
@@ -39,6 +39,7 @@ def pytest_collection_modifyitems(session, config, items):
     items[:] = [
         item for item in items if
         isinstance(item.cls, type) and issubclass(item.cls, fixtures.TestBase)
+        and not item.cls.__name__.startswith("_")
     ]
 
 def pytest_pycollect_makeitem(collector, name, obj):
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index 82e37ce99..ecd2633f3 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -108,6 +108,7 @@ def %(name)s(%(args)s):
                             {targ_name: target, fn_name: fn},
                             fn.__name__)
         decorated.__defaults__ = getattr(fn, 'im_func', fn).__defaults__
+        decorated.__wrapped__ = fn
         return update_wrapper(decorated, fn)
     return update_wrapper(decorate, target)
 
diff --git a/setup.cfg b/setup.cfg
index 43e44c667..9729df3b7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,6 +8,10 @@ exclude = ^examples
 first-package-wins = true
 where = test
 
+[pytest]
+addopts= --tb native -v -r fEsxX
+python_files=test/*
+
 [upload]
 sign = 1
 identity = C4DAFEE1
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index f4977b9ca..a46c7372e 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -829,12 +829,12 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         e = engines.testing_engine(options={"poolclass": AssertionPool})
         fn(e)
 
-    @testing.uses_deprecated
+    @testing.uses_deprecated()
     def test_reflect_uses_bind_constructor_conn(self):
         self._test_reflect_uses_bind(lambda e: MetaData(e.connect(),
                     reflect=True))
 
-    @testing.uses_deprecated
+    @testing.uses_deprecated()
     def test_reflect_uses_bind_constructor_engine(self):
         self._test_reflect_uses_bind(lambda e: MetaData(e, reflect=True))
 
diff --git a/test/profiles.txt b/test/profiles.txt
index 4f833ef1c..79f349874 100644
--- a/test/profiles.txt
+++ b/test/profiles.txt
@@ -99,6 +99,26 @@ 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