Merge pull request ceph#37245 from mgfritch/cephadm-extra-ceph-conf-test

mgr/cephadm: fixup expected extra ceph conf test result Reviewed-by: Adam King <[email protected]>
ypdai · Sep 18, 2020 · a6c06a9 · a6c06a9
2 parents ec05d87 + b320521
commit a6c06a9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -282,7 +282,9 @@ def test_daemon_check_extra_config(self, _run_cephadm, cephadm_module: CephadmOr
                 cephadm_module._check_daemons()
 
                 _run_cephadm.assert_called_with('test', 'mon.test', 'deploy', [
-                                                '--name', 'mon.test', '--config-json', '-', '--reconfig'], stdin='{"config": "\\n\\n[mon]\\nk=v\\n", "keyring": ""}')
+                                                '--name', 'mon.test', '--reconfig', '--config-json', '-'],
+                                                stdin='{"config": "\\n\\n[mon]\\nk=v\\n", "keyring": ""}',
+                                                image='')
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_daemon_check_post(self, cephadm_module: CephadmOrchestrator):