From 8b70bb64d36d69fff3043b10491f08a63c6957df Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 02:25:18 +0000
Subject: [PATCH] [8.0.x] Catch `OSError` from `getpass.getuser()` (#11876)

Co-authored-by: Russell Martin <russell@rjm.li>
---
 AUTHORS                    | 1 +
 changelog/11875.bugfix.rst | 1 +
 src/_pytest/tmpdir.py      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog/11875.bugfix.rst

diff --git a/AUTHORS b/AUTHORS
index a4f4d8410..96dbc1c12 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -338,6 +338,7 @@ Ronny Pfannschmidt
 Ross Lawley
 Ruaridh Williamson
 Russel Winder
+Russell Martin
 Ryan Puddephatt
 Ryan Wooden
 Sadra Barikbin
diff --git a/changelog/11875.bugfix.rst b/changelog/11875.bugfix.rst
new file mode 100644
index 000000000..d646be631
--- /dev/null
+++ b/changelog/11875.bugfix.rst
@@ -0,0 +1 @@
+Correctly handle errors from :func:`getpass.getuser` in Python 3.13.
diff --git a/src/_pytest/tmpdir.py b/src/_pytest/tmpdir.py
index 6fa227760..4733b8c43 100644
--- a/src/_pytest/tmpdir.py
+++ b/src/_pytest/tmpdir.py
@@ -203,7 +203,7 @@ def get_user() -> Optional[str]:
         import getpass
 
         return getpass.getuser()
-    except (ImportError, KeyError):
+    except (ImportError, OSError, KeyError):
         return None