From: Sebastian Wagner <sewagner@redhat.com>
Date: Fri, 24 Sep 2021 10:55:03 +0000 (+0200)
Subject: cephadm: Fix TestMaintenance trying to list /var/lib/ceph
X-Git-Tag: v17.1.0~817^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43298%2Fhead;p=ceph.git

cephadm: Fix TestMaintenance trying to list /var/lib/ceph

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
---

diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py
index 13803f6203c4..9a55a9b83449 100644
--- a/src/cephadm/tests/test_cephadm.py
+++ b/src/cephadm/tests/test_cephadm.py
@@ -940,9 +940,10 @@ class TestMaintenance:
         with pytest.raises(SystemExit):
             cd._parse_args(['host-maintenance', 'wah'])
 
+    @mock.patch('os.listdir', return_value=[])
     @mock.patch('cephadm.call')
     @mock.patch('cephadm.systemd_target_state')
-    def test_enter_failure_1(self, _target_state, _call):
+    def test_enter_failure_1(self, _target_state, _call, _listdir):
         _call.return_value = '', '', 999
         _target_state.return_value = True
         ctx: cd.CephadmContext = cd.cephadm_init_ctx(
@@ -951,9 +952,10 @@ class TestMaintenance:
         retval = cd.command_maintenance(ctx)
         assert retval.startswith('failed')
 
+    @mock.patch('os.listdir', return_value=[])
     @mock.patch('cephadm.call')
     @mock.patch('cephadm.systemd_target_state')
-    def test_enter_failure_2(self, _target_state, _call):
+    def test_enter_failure_2(self, _target_state, _call, _listdir):
         _call.side_effect = [('', '', 0), ('', '', 999)]
         _target_state.return_value = True
         ctx: cd.CephadmContext = cd.cephadm_init_ctx(
@@ -962,10 +964,11 @@ class TestMaintenance:
         retval = cd.command_maintenance(ctx)
         assert retval.startswith('failed')
 
+    @mock.patch('os.listdir', return_value=[])
     @mock.patch('cephadm.call')
     @mock.patch('cephadm.systemd_target_state')
     @mock.patch('cephadm.target_exists')
-    def test_exit_failure_1(self, _target_exists, _target_state, _call):
+    def test_exit_failure_1(self, _target_exists, _target_state, _call, _listdir):
         _call.return_value = '', '', 999
         _target_state.return_value = False
         _target_exists.return_value = True
@@ -975,10 +978,11 @@ class TestMaintenance:
         retval = cd.command_maintenance(ctx)
         assert retval.startswith('failed')
 
+    @mock.patch('os.listdir', return_value=[])
     @mock.patch('cephadm.call')
     @mock.patch('cephadm.systemd_target_state')
     @mock.patch('cephadm.target_exists')
-    def test_exit_failure_2(self, _target_exists, _target_state, _call):
+    def test_exit_failure_2(self, _target_exists, _target_state, _call, _listdir):
         _call.side_effect = [('', '', 0), ('', '', 999)]
         _target_state.return_value = False
         _target_exists.return_value = True