From c848d0a771c41b25a3bd8ff8e29cc5493b116a25 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <rc@braveface.nz>
Date: Mon, 16 Jan 2017 16:09:46 +1300
Subject: [PATCH] Pass parameter name to `make_parametrize_id` hook function

---
 AUTHORS                    |  1 +
 CHANGELOG.rst              |  5 +++++
 _pytest/hookspec.py        |  3 ++-
 _pytest/python.py          |  5 +++--
 testing/python/metafunc.py | 23 +++++++++++++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 30132759b..34189d61a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -120,6 +120,7 @@ Quentin Pradet
 Ralf Schmitt
 Raphael Pierzina
 Raquel Alegre
+Ravi Chandra
 Roberto Polli
 Romain Dorgueil
 Roman Bolshakov
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3d78d3273..e4c5f2a79 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -79,10 +79,15 @@ Changes
   subdirectories with ini configuration files now uses the correct ini file
   (`#2148`_).  Thanks `@pelme`_.
 
+* Modify ``pytest_make_parametrize_id()`` hook to accept ``argname`` as an
+  additional parameter.
+  Thanks `@unsignedint`_ for the PR.
+
 *
 
 .. _@malinoff: https://github.com/malinoff
 .. _@pelme: https://github.com/pelme
+.. _@unsignedint: https://github.com/unsignedint
 
 .. _#2129: https://github.com/pytest-dev/pytest/issues/2129
 .. _#2148: https://github.com/pytest-dev/pytest/issues/2148
diff --git a/_pytest/hookspec.py b/_pytest/hookspec.py
index b5f51eccf..989cb0c0b 100644
--- a/_pytest/hookspec.py
+++ b/_pytest/hookspec.py
@@ -157,9 +157,10 @@ def pytest_generate_tests(metafunc):
     """ generate (multiple) parametrized calls to a test function."""
 
 @hookspec(firstresult=True)
-def pytest_make_parametrize_id(config, val):
+def pytest_make_parametrize_id(config, val, argname=None):
     """Return a user-friendly string representation of the given ``val`` that will be used
     by @pytest.mark.parametrize calls. Return None if the hook doesn't know about ``val``.
+    The parameter name is available as ``argname``, if required.
     """
 
 # -------------------------------------------------------------------------
diff --git a/_pytest/python.py b/_pytest/python.py
index fee68251d..18da7ac23 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -197,7 +197,7 @@ def pytest_pycollect_makeitem(collector, name, obj):
                 res = list(collector._genfunctions(name, obj))
             outcome.force_result(res)
 
-def pytest_make_parametrize_id(config, val):
+def pytest_make_parametrize_id(config, val, argname=None):
     return None
 
 
@@ -941,7 +941,8 @@ def _idval(val, argname, idx, idfn, config=None):
             return _escape_strings(s)
 
     if config:
-        hook_id = config.hook.pytest_make_parametrize_id(config=config, val=val)
+        hook_id = config.hook.pytest_make_parametrize_id(
+            config=config, val=val, argname=argname)
         if hook_id:
             return hook_id
 
diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py
index e88107d0b..9eea699bf 100644
--- a/testing/python/metafunc.py
+++ b/testing/python/metafunc.py
@@ -1455,3 +1455,26 @@ class TestMarkersWithParametrization:
             "*test_func*0*PASS*",
             "*test_func*2*PASS*",
         ])
+
+    def test_pytest_make_parametrize_id_with_argname(self, testdir):
+        testdir.makeconftest("""
+            def pytest_make_parametrize_id(config, val, argname):
+                return str(val * 2 if argname == 'x' else val * 10)
+        """)
+        testdir.makepyfile("""
+                import pytest
+
+                @pytest.mark.parametrize("x", range(2))
+                def test_func(x):
+                    pass
+
+                @pytest.mark.parametrize("y", [1])
+                def test_func2(y):
+                    pass
+                """)
+        result = testdir.runpytest("-v")
+        result.stdout.fnmatch_lines([
+            "*test_func*0*PASS*",
+            "*test_func*2*PASS*",
+            "*test_func2*10*PASS*",
+        ])