Merge branch 'master' into setup-install-extension

Conflicts:
	setup.py

2 files changed, 4 insertions, 2 deletions

diff --git a/tests/test_utils.py b/tests/test_utils.py
index c640367e..e3e53d63 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -50,7 +50,7 @@ def test_check_backend_support_skip():
                         funcargs={"backend": True})
     with pytest.raises(pytest.skip.Exception) as exc_info:
         check_backend_support(item)
-    assert exc_info.value.args[0] == "Nope"
+    assert exc_info.value.args[0] == "Nope (True)"
 
 
 def test_check_backend_support_no_skip():
diff --git a/tests/utils.py b/tests/utils.py
index beb2ca5d..693a0c8f 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -28,7 +28,9 @@ def check_backend_support(item):
     supported = item.keywords.get("supported")
     if supported and "backend" in item.funcargs:
         if not supported.kwargs["only_if"](item.funcargs["backend"]):
-            pytest.skip(supported.kwargs["skip_message"])
+            pytest.skip("{0} ({1})".format(
+                supported.kwargs["skip_message"], item.funcargs["backend"]
+            ))
     elif supported:
         raise ValueError("This mark is only available on methods that take a "
                          "backend")