From 0ba93f829ccd4791463a63171ce9929187e855e6 Mon Sep 17 00:00:00 2001 From: David Murphy < dmurphy@saltstack.com> Date: Thu, 8 Feb 2024 09:38:09 -0700 Subject: [PATCH] Fix up use of get_machine_identifer --- salt/utils/process.py | 2 +- tests/pytests/functional/utils/gitfs/test_gitfs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/utils/process.py b/salt/utils/process.py index 56e75d55ccf..9cb7633ff9e 100644 --- a/salt/utils/process.py +++ b/salt/utils/process.py @@ -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}'" ) diff --git a/tests/pytests/functional/utils/gitfs/test_gitfs.py b/tests/pytests/functional/utils/gitfs/test_gitfs.py index 36c93797978..fc2cfb303b5 100644 --- a/tests/pytests/functional/utils/gitfs/test_gitfs.py +++ b/tests/pytests/functional/utils/gitfs/test_gitfs.py @@ -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() == ( [