]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Fix TestMaintenance trying to list /var/lib/ceph
authorSebastian Wagner <sewagner@redhat.com>
Fri, 24 Sep 2021 10:55:03 +0000 (12:55 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 2 Nov 2021 09:01:18 +0000 (10:01 +0100)
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 767564864f15ea8afe9b925345cdf59db1815cb0)

src/cephadm/tests/test_cephadm.py

index 958797e17a72deca80f5347d262a8dd5e211bf54..7571284b449b50f9e46913c91abed967966b8e20 100644 (file)
@@ -920,9 +920,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(
@@ -931,9 +932,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(
@@ -942,10 +944,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
@@ -955,10 +958,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