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

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index 86f3b7aac..97cee7e27 100644
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@ -141,7 +141,10 @@ class compound(object):
 
         for skip in self.skips:
             if self._check_combinations(combination, skip) and skip(cfg):
-                msg = "'%s' : %s" % (fn.__name__, skip._as_string(cfg))
+                msg = "'%s' : %s" % (
+                    config.get_current_test_name(),
+                    skip._as_string(cfg),
+                )
                 config.skip_test(msg)
 
         try: