From 329f56ecec5a9fcbfa160d4b467342a7c19ef2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=8E=AE?= <linw1995@icloud.com>
Date: Sat, 16 Nov 2019 14:49:17 +0800
Subject: [PATCH 1/2] Fix incorrect result of getmodpath method.

---
 AUTHORS                   | 1 +
 changelog/6189.bugfix.rst | 1 +
 src/_pytest/python.py     | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog/6189.bugfix.rst

diff --git a/AUTHORS b/AUTHORS
index d0e584f636..c10ee5c15c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -261,6 +261,7 @@ Virgil Dupras
 Vitaly Lashmanov
 Vlad Dragos
 Volodymyr Piskun
+Wei Lin
 Wil Cooley
 William Lee
 Wim Glenn
diff --git a/changelog/6189.bugfix.rst b/changelog/6189.bugfix.rst
new file mode 100644
index 0000000000..060a2260a2
--- /dev/null
+++ b/changelog/6189.bugfix.rst
@@ -0,0 +1 @@
+Fix incorrect result of ``getmodpath`` method.
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
index b8b365ad34..734a92f9bb 100644
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -285,8 +285,7 @@ def getmodpath(self, stopatmodule=True, includemodule=False):
                     break
             parts.append(name)
         parts.reverse()
-        s = ".".join(parts)
-        return s.replace(".[", "[")
+        return ".".join(parts)
 
     def reportinfo(self):
         # XXX caching?

From 5d5f48097922dae26da06a12482a7a74de7ba924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=8E=AE?= <linw1995@icloud.com>
Date: Mon, 18 Nov 2019 23:46:18 +0800
Subject: [PATCH 2/2] Hardening an existing test for demonstrating this change.

---
 testing/test_collection.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/testing/test_collection.py b/testing/test_collection.py
index 8050e80f98..fe5d66e948 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -685,6 +685,8 @@ def test_2():
     def test_example_items1(self, testdir):
         p = testdir.makepyfile(
             """
+            import pytest
+
             def testone():
                 pass
 
@@ -693,19 +695,24 @@ def testmethod_one(self):
                     pass
 
             class TestY(TestX):
-                pass
+                @pytest.mark.parametrize("arg0", [".["])
+                def testmethod_two(self, arg0):
+                    pass
         """
         )
         items, reprec = testdir.inline_genitems(p)
-        assert len(items) == 3
+        assert len(items) == 4
         assert items[0].name == "testone"
         assert items[1].name == "testmethod_one"
         assert items[2].name == "testmethod_one"
+        assert items[3].name == "testmethod_two[.[]"
 
         # let's also test getmodpath here
         assert items[0].getmodpath() == "testone"
         assert items[1].getmodpath() == "TestX.testmethod_one"
         assert items[2].getmodpath() == "TestY.testmethod_one"
+        # PR #6202: Fix incorrect result of getmodpath method. (Resolves issue #6189)
+        assert items[3].getmodpath() == "TestY.testmethod_two[.[]"
 
         s = items[0].getmodpath(stopatmodule=False)
         assert s.endswith("test_example_items1.testone")