github/opencas-test-framework
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename systemd to systemctl and move it to tools

Browse Source 
Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>
This commit is contained in:
Katarzyna Treder 2024-12-10 14:46:04 +01:00
parent a6848ed825
commit ae9b036b47
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test_tools/fstab.py
View File

@ -4,18 +4,17 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
from test_tools import fs_utils from test_tools import fs_utils, systemctl
from test_utils import systemd
def add_mountpoint(device, mount_point, fs_type, mount_now=True): def add_mountpoint(device, mount_point, fs_type, mount_now=True):
fs_utils.append_line("/etc/fstab", fs_utils.append_line("/etc/fstab",
f"{device.path} {mount_point} {fs_type.name} defaults 0 0") f"{device.path} {mount_point} {fs_type.name} defaults 0 0")
systemd.reload_daemon() systemctl.reload_daemon()
if mount_now: if mount_now:
systemd.restart_service("local-fs.target") systemctl.restart_service("local-fs.target")
def remove_mountpoint(device): def remove_mountpoint(device):
fs_utils.remove_lines("/etc/fstab", device.path) fs_utils.remove_lines("/etc/fstab", device.path)
systemd.reload_daemon() systemctl.reload_daemon()

2
test_utils/systemd.py → test_tools/systemctl.py
View File

@ -1,10 +1,10 @@
# #
# Copyright(c) 2019-2022 Intel Corporation # Copyright(c) 2019-2022 Intel Corporation
# Copyright(c) 2024 Huawei Technologies Co., Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
from pathlib import Path from pathlib import Path
from core.test_run import TestRun from core.test_run import TestRun
systemd_service_directory = Path("/usr/lib/systemd/system/") systemd_service_directory = Path("/usr/lib/systemd/system/")

2
test_utils/emergency_escape.py
View File

@ -7,7 +7,7 @@ from textwrap import dedent
from string import Template from string import Template
from pathlib import Path from pathlib import Path
from .systemd import enable_service, reload_daemon, systemd_service_directory, disable_service from test_tools.systemctl import enable_service, reload_daemon, systemd_service_directory
from test_tools.fs_utils import ( from test_tools.fs_utils import (
create_file, create_file,
write_file, write_file,