saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix up use of get_machine_identifer

Browse source
This commit is contained in:
David Murphy 2024-02-08 09:38:09 -07:00 • committed by Daniel Wozniak
parent 0206162c2d
commit 0ba93f829c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/process.py
View file

@ -1072,7 +1072,7 @@ class SignalHandlingProcess(Process):
msg += ". Exiting"
log.debug(msg)
mach_id = salt.utils.platform.get_machine_identifier()
mach_id = salt.utils.files.get_machine_identifier()
log.debug(
f"exiting for process id '{os.getpid()}' and machine identifer '{mach_id}'"
)

4
tests/pytests/functional/utils/gitfs/test_gitfs.py
View file

@ -2,7 +2,7 @@ import os.path
import pytest
import salt.utils.platform
import salt.utils.files
from salt.fileserver.gitfs import PER_REMOTE_ONLY, PER_REMOTE_OVERRIDES
from salt.utils.gitfs import GitFS, GitPython, Pygit2
from salt.utils.immutabletypes import ImmutableDict, ImmutableList
@ -249,7 +249,7 @@ def _test_lock(opts):
g.fetch_remotes()
assert len(g.remotes) == 1
repo = g.remotes[0]
mach_id = salt.utils.platform.get_machine_identifier()
mach_id = salt.utils.files.get_machine_identifier()
assert repo.get_salt_working_dir() in repo._get_lock_file()
assert repo.lock() == (
[