Test fixture improvements

- ensure we escape out percent signs when a CompiledSQL or RegexSQL
has percent signs in the SQL or in the parameter repr

- to support combinations, print out complete test name in skip
messages, py.test environment gives us a way to do this

Change-Id: Ia9e62f7c1026c1465986144c5757e35fc164a2b8

2 files changed, 6 insertions, 0 deletions

diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index be1984c9e..33967ec15 100644
--- a/lib/sqlalchemy/testing/plugin/plugin_base.py
+++ b/lib/sqlalchemy/testing/plugin/plugin_base.py
@@ -730,6 +730,9 @@ class FixtureFunctions(ABC):
     def fixture(self, *arg, **kw):
         raise NotImplementedError()
 
+    def get_current_test_name(self):
+        raise NotImplementedError()
+
 
 _fixture_fn_class = None
 
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
index 2f7df97fa..44fccf28d 100644
--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
@@ -412,3 +412,6 @@ class PytestFixtureFunctions(plugin_base.FixtureFunctions):
 
     def fixture(self, *arg, **kw):
         return pytest.fixture(*arg, **kw)
+
+    def get_current_test_name(self):
+        return os.environ.get("PYTEST_CURRENT_TEST")