saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Enhance error messages in zypperpkg module

Browse source 
Enhance capture of error messages for Zypper calls in zypperpkg module.
This commit is contained in:
Yeray Gutiérrez Cedrés 2022-07-22 11:18:06 +01:00 • committed by Megan Wilhite
parent 2c8088f005
commit 6312d20b4f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/zypperpkg.py
View file

@ -294,6 +294,10 @@ class _Zypper:
self.__call_result["stderr"]
and self.__call_result["stderr"].strip()
or ""
) or (
self.__call_result["stdout"]
and self.__call_result["stdout"].strip()
or ""
)
if msg:
_error_msg.append(msg)

8
tests/unit/modules/test_zypperpkg.py
View file

@ -203,11 +203,17 @@ class ZypperTestCase(TestCase, LoaderModuleMockMixin):
):
zypper.__zypper__.xml.call("crashme")
output_to_user = "Output to user"
sniffer = RunSniffer(stdout=output_to_user, retcode=1)
with patch.dict("salt.modules.zypperpkg.__salt__", {"cmd.run_all": sniffer}):
with self.assertRaisesRegex(
CommandExecutionError, "^Zypper command failure: Check Zypper's logs.$"
CommandExecutionError,
"^Zypper command failure: {}$".format(output_to_user),
):
zypper.__zypper__.call("crashme again")
sniffer = RunSniffer(retcode=1)
with patch.dict("salt.modules.zypperpkg.__salt__", {"cmd.run_all": sniffer}):
zypper.__zypper__.noraise.call("stay quiet")
self.assertEqual(zypper.__zypper__.error_msg, "Check Zypper's logs.")