From: Adam King <adking@redhat.com>
Date: Thu, 8 Sep 2022 20:13:08 +0000 (-0400)
Subject: mgr/cephadm: fix custom config unit test
X-Git-Tag: v17.2.6~187^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f22f8d88f5e867e831b474b38de7bbdda878634f;p=ceph.git

mgr/cephadm: fix custom config unit test

this test needs to be updated to account for the
new keyring information being introduced

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit b2085f0853b9d487a2f0275cdf401df970d85159)
---

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index 373e7dd0632..e7dd47081a3 100644
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -494,7 +494,7 @@ class TestCephadm(object):
         ]
         conf_outs = [json.dumps(c.to_json()) for c in configs]
         stdin_str = '{' + \
-            f'"config": "", "keyring": "", "custom_config_files": [{conf_outs[0]}, {conf_outs[1]}]' + '}'
+            f'"config": "", "keyring": "[client.crash.test]\\nkey = None\\n", "custom_config_files": [{conf_outs[0]}, {conf_outs[1]}]' + '}'
         with with_host(cephadm_module, 'test'):
             with with_service(cephadm_module, ServiceSpec(service_type='crash', custom_configs=configs), CephadmOrchestrator.apply_crash):
                 _run_cephadm.assert_called_with(