Merging upstream version 2.17.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 9 insertions, 3 deletions

diff --git a/test/units/playbook/test_block.py b/test/units/playbook/test_block.py
index aac5f71..3c4dfb1 100644
--- a/test/units/playbook/test_block.py
+++ b/test/units/playbook/test_block.py
@@ -20,6 +20,10 @@ from __future__ import annotations
 import unittest
 from ansible.playbook.block import Block
 from ansible.playbook.task import Task
+from ansible.plugins.loader import init_plugin_loader
+
+
+init_plugin_loader()
 
 
 class TestBlock(unittest.TestCase):
diff --git a/test/units/playbook/test_helpers.py b/test/units/playbook/test_helpers.py
index 2977b0d..fb6170c 100644
--- a/test/units/playbook/test_helpers.py
+++ b/test/units/playbook/test_helpers.py
@@ -24,13 +24,16 @@ from unittest.mock import MagicMock
 from units.mock.loader import DictDataLoader
 
 from ansible import errors
+from ansible.playbook import helpers
 from ansible.playbook.block import Block
 from ansible.playbook.handler import Handler
 from ansible.playbook.task import Task
 from ansible.playbook.task_include import TaskInclude
 from ansible.playbook.role.include import RoleInclude
+from ansible.plugins.loader import init_plugin_loader
 
-from ansible.playbook import helpers
+
+init_plugin_loader()
 
 
 class MixinForMocks(object):
diff --git a/test/units/utils/display/test_broken_cowsay.py b/test/units/utils/display/test_broken_cowsay.py
index 854b78b..50691c2 100644
--- a/test/units/utils/display/test_broken_cowsay.py
+++ b/test/units/utils/display/test_broken_cowsay.py
@@ -10,13 +10,12 @@ from unittest.mock import MagicMock
 
 
 def test_display_with_fake_cowsay_binary(capsys, mocker):
-    display = Display()
 
     mocker.patch("ansible.constants.ANSIBLE_COW_PATH", "./cowsay.sh")
-
     mock_popen = MagicMock()
     mock_popen.return_value.returncode = 1
     mocker.patch("subprocess.Popen", mock_popen)
+    display = Display()
 
     assert not hasattr(display, "cows_available")
     assert display.b_cowsay is None