]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix the indent
authorKefu Chai <tchaikov@gmail.com>
Mon, 10 Oct 2022 14:43:23 +0000 (22:43 +0800)
committerNizamudeen A <nia@redhat.com>
Tue, 11 Oct 2022 06:22:54 +0000 (11:52 +0530)
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 38dc57ac9a88dafbe73038ea757dfa778c6191a7)

 Conflicts:
src/cephadm/tests/fixtures.py
  - Replace _cephadm with cd

src/cephadm/tests/fixtures.py

index 843fb4b33e9ec284dded496b03a6542e0bb2db63..fffab9085f18c0190527c0cfe43d146c8eabe20d 100644 (file)
@@ -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