From: Kefu Chai Date: Mon, 10 Oct 2022 14:43:23 +0000 (+0800) Subject: cephadm: fix the indent X-Git-Tag: v17.2.6~454^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2238d2d161bb5168f877a1f74319f8752dd75b1;p=ceph.git cephadm: fix the indent Signed-off-by: Kefu Chai (cherry picked from commit 38dc57ac9a88dafbe73038ea757dfa778c6191a7) Conflicts: src/cephadm/tests/fixtures.py - Replace _cephadm with cd --- diff --git a/src/cephadm/tests/fixtures.py b/src/cephadm/tests/fixtures.py index 843fb4b33e9e..fffab9085f18 100644 --- a/src/cephadm/tests/fixtures.py +++ b/src/cephadm/tests/fixtures.py @@ -1,3 +1,4 @@ +from calendar import c import mock import os import pytest @@ -68,17 +69,17 @@ def cephadm_fs( mock.patch('platform.processor', return_value='x86_64'), \ mock.patch('cephadm.extract_uid_gid', return_value=(uid, gid)): - if not fake_filesystem.is_root(): - fake_filesystem.set_uid(0) + if not fake_filesystem.is_root(): + fake_filesystem.set_uid(0) - fs.create_dir(cd.DATA_DIR) - fs.create_dir(cd.LOG_DIR) - fs.create_dir(cd.LOCK_DIR) - fs.create_dir(cd.LOGROTATE_DIR) - fs.create_dir(cd.UNIT_DIR) - fs.create_dir('/sys/block') + fs.create_dir(cd.DATA_DIR) + fs.create_dir(cd.LOG_DIR) + fs.create_dir(cd.LOCK_DIR) + fs.create_dir(cd.LOGROTATE_DIR) + fs.create_dir(cd.UNIT_DIR) + fs.create_dir('/sys/block') - yield fs + yield fs @contextmanager