]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Fix TestMaintenance trying to list /var/lib/ceph 43298/head
authorSebastian Wagner <sewagner@redhat.com>
Fri, 24 Sep 2021 10:55:03 +0000 (12:55 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Fri, 24 Sep 2021 10:55:03 +0000 (12:55 +0200)
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
src/cephadm/tests/test_cephadm.py

index 13803f6203c4c026deab8cdd7c7fe79135ff260b..9a55a9b834491011807f6c247664b0efa8c82469 100644 (file)
@@ -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