From d6b5fb6ac896ea3f73567a98de4a5dba2661182f Mon Sep 17 00:00:00 2001
From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:49:41 -0400
Subject: [PATCH] Fix error message given by
 ansible.module_utils.facts.timeout.timeout (#83945) (#84069)

(cherry picked from commit ee9e6130a7d4a3765a6e18abdd979d244c3fce7c)
---
 changelogs/fragments/fix-module-utils-facts-timeout.yml | 2 ++
 lib/ansible/module_utils/facts/timeout.py               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/fix-module-utils-facts-timeout.yml

diff --git a/changelogs/fragments/fix-module-utils-facts-timeout.yml b/changelogs/fragments/fix-module-utils-facts-timeout.yml
new file mode 100644
index 00000000000..3ecc95dfab3
--- /dev/null
+++ b/changelogs/fragments/fix-module-utils-facts-timeout.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - Use the requested error message in the ansible.module_utils.facts.timeout timeout function instead of hardcoding one.
diff --git a/lib/ansible/module_utils/facts/timeout.py b/lib/ansible/module_utils/facts/timeout.py
index 5fb749fb6b3..3b0476245b8 100644
--- a/lib/ansible/module_utils/facts/timeout.py
+++ b/lib/ansible/module_utils/facts/timeout.py
@@ -48,7 +48,7 @@ def timeout(seconds=None, error_message="Timer expired"):
                 return res.get(timeout_value)
             except multiprocessing.TimeoutError:
                 # This is an ansible.module_utils.common.facts.timeout.TimeoutError
-                raise TimeoutError('Timer expired after %s seconds' % timeout_value)
+                raise TimeoutError(f'{error_message} after {timeout_value} seconds')
             finally:
                 pool.terminate()