From 2c7d97406c79c48d394203c149f4c5efdb6d4eac Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 24 Sep 2021 12:55:03 +0200 Subject: [PATCH] cephadm: Fix TestMaintenance trying to list /var/lib/ceph Signed-off-by: Sebastian Wagner (cherry picked from commit 767564864f15ea8afe9b925345cdf59db1815cb0) --- src/cephadm/tests/test_cephadm.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py index 958797e17a72d..7571284b449b5 100644 --- a/src/cephadm/tests/test_cephadm.py +++ b/src/cephadm/tests/test_cephadm.py @@ -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 -- 2.39.5