65598582f5
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=179
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From bdeb632c49a0002d2b492816bcca112e371cc147 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Mon, 8 Jul 2019 14:46:10 +0100
|
|
Subject: [PATCH] Prevent ansiblegate unit tests to fail on Ubuntu
|
|
|
|
---
|
|
tests/unit/modules/test_ansiblegate.py | 26 ++++++++++++++++++--------
|
|
1 file changed, 18 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/tests/unit/modules/test_ansiblegate.py b/tests/unit/modules/test_ansiblegate.py
|
|
index 61aad44b5c..6724d37c40 100644
|
|
--- a/tests/unit/modules/test_ansiblegate.py
|
|
+++ b/tests/unit/modules/test_ansiblegate.py
|
|
@@ -184,18 +184,28 @@ description:
|
|
ret = _ansible_module_caller.call(
|
|
"one.two.three", "arg_1", kwarg1="foobar"
|
|
)
|
|
- proc.assert_any_call(
|
|
- [
|
|
- "echo",
|
|
- '{"ANSIBLE_MODULE_ARGS": {"kwarg1": "foobar", "_raw_params": "arg_1"}}',
|
|
- ],
|
|
- stdout=-1,
|
|
- timeout=1200,
|
|
- )
|
|
proc.assert_any_call(
|
|
["python3", "foofile"],
|
|
stdin=ANSIBLE_MODULE_ARGS,
|
|
stdout=-1,
|
|
timeout=1200,
|
|
)
|
|
+ try:
|
|
+ proc.assert_any_call(
|
|
+ [
|
|
+ "echo",
|
|
+ '{"ANSIBLE_MODULE_ARGS": {"kwarg1": "foobar", "_raw_params": "arg_1"}}',
|
|
+ ],
|
|
+ stdout=-1,
|
|
+ timeout=1200,
|
|
+ )
|
|
+ except AssertionError:
|
|
+ proc.assert_any_call(
|
|
+ [
|
|
+ "echo",
|
|
+ '{"ANSIBLE_MODULE_ARGS": {"_raw_params": "arg_1", "kwarg1": "foobar"}}',
|
|
+ ],
|
|
+ stdout=-1,
|
|
+ timeout=1200,
|
|
+ )
|
|
assert ret == {"completed": True, "timeout": 1200}
|
|
--
|
|
2.29.2
|
|
|
|
|