From 025ab7de1a175e0bb8ad598adfa610045a004db8 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 16 May 2020 11:36:22 -0300
Subject: [PATCH] Add test and changelog for #6428

---
 changelog/6428.bugfix.rst |  2 ++
 testing/test_nodes.py     | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 changelog/6428.bugfix.rst

diff --git a/changelog/6428.bugfix.rst b/changelog/6428.bugfix.rst
new file mode 100644
index 00000000000..581b2b7cece
--- /dev/null
+++ b/changelog/6428.bugfix.rst
@@ -0,0 +1,2 @@
+Paths appearing in error messages are now correct in case the current working directory has
+changed since the start of the session.
diff --git a/testing/test_nodes.py b/testing/test_nodes.py
index dbb3e2e8f64..5bd31b34261 100644
--- a/testing/test_nodes.py
+++ b/testing/test_nodes.py
@@ -58,3 +58,30 @@ class FakeSession:
 
     outside = py.path.local("/outside")
     assert nodes._check_initialpaths_for_relpath(FakeSession, outside) is None
+
+
+def test_failure_with_changed_cwd(testdir):
+    """
+    Test failure lines should use absolute paths if cwd has changed since
+    invocation, so the path is correct (#6428).
+    """
+    p = testdir.makepyfile(
+        """
+        import os
+        import pytest
+
+        @pytest.fixture
+        def private_dir():
+            out_dir = 'ddd'
+            os.mkdir(out_dir)
+            old_dir = os.getcwd()
+            os.chdir(out_dir)
+            yield out_dir
+            os.chdir(old_dir)
+
+        def test_show_wrong_path(private_dir):
+            assert False
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines([str(p) + ":*: AssertionError", "*1 failed in *"])