From a6e77b1d1a0668e92ce0489ac31468d2c4047d81 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 17 Aug 2023 14:38:42 -0400 Subject: [PATCH] cephadm: for test fixture use constants from new constants.py Signed-off-by: John Mulligan Pair-programmed-with: Adam King Co-authored-by: Adam King --- src/cephadm/tests/fixtures.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cephadm/tests/fixtures.py b/src/cephadm/tests/fixtures.py index 76ac0b44cf987..db437e20fee3f 100644 --- a/src/cephadm/tests/fixtures.py +++ b/src/cephadm/tests/fixtures.py @@ -67,6 +67,8 @@ def cephadm_fs( """ use pyfakefs to stub filesystem calls """ + from cephadmlib import constants + uid = os.getuid() gid = os.getgid() @@ -91,11 +93,11 @@ def cephadm_fs( except AttributeError: pass - fs.create_dir(_cephadm.DATA_DIR) - fs.create_dir(_cephadm.LOG_DIR) - fs.create_dir(_cephadm.LOCK_DIR) - fs.create_dir(_cephadm.LOGROTATE_DIR) - fs.create_dir(_cephadm.UNIT_DIR) + fs.create_dir(constants.DATA_DIR) + fs.create_dir(constants.LOG_DIR) + fs.create_dir(constants.LOCK_DIR) + fs.create_dir(constants.LOGROTATE_DIR) + fs.create_dir(constants.UNIT_DIR) fs.create_dir('/sys/block') yield fs -- 2.39.5