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 2

Add allowance for machine identifier for recent test

Browse source
This commit is contained in:
David Murphy 2024-05-10 09:46:27 -06:00 • committed by Daniel Wozniak
parent 56f3cbeff8
commit b9203f80db
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/pytests/functional/utils/gitfs/test_pillar.py
View file

@ -5,6 +5,7 @@ import pytest
from salt.pillar.git_pillar import GLOBAL_ONLY, PER_REMOTE_ONLY, PER_REMOTE_OVERRIDES from salt.pillar.git_pillar import GLOBAL_ONLY, PER_REMOTE_ONLY, PER_REMOTE_OVERRIDES
from salt.utils.gitfs import GitPillar, GitPython, Pygit2 from salt.utils.gitfs import GitPillar, GitPython, Pygit2
from salt.utils.immutabletypes import ImmutableDict, ImmutableList from salt.utils.immutabletypes import ImmutableDict, ImmutableList
from salt.utils.platform import get_machine_identifier as _get_machine_identifier
pytestmark = [ pytestmark = [
pytest.mark.windows_whitelisted, pytest.mark.windows_whitelisted,
@ -339,17 +340,24 @@ def _test_lock(opts):
p.fetch_remotes() p.fetch_remotes()
assert len(p.remotes) == 1 assert len(p.remotes) == 1
repo = p.remotes[0] repo = p.remotes[0]
mach_id = _get_machine_identifier().get("machine_id", "no_machine_id_available")
assert repo.get_salt_working_dir() in repo._get_lock_file() assert repo.get_salt_working_dir() in repo._get_lock_file()
assert repo.lock() == ( assert repo.lock() == (
[ [
"Set update lock for git_pillar remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'" (
f"Set update lock for gitfs remote "
f"'https://github.com/saltstack/salt-test-pillar-gitfs.git' on machine_id '{mach_id}'"
)
], ],
[], [],
) )
assert os.path.isfile(repo._get_lock_file()) assert os.path.isfile(repo._get_lock_file())
assert repo.clear_lock() == ( assert repo.clear_lock() == (
[ [
"Removed update lock for git_pillar remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'" (
f"Removed update lock for gitfs remote "
f"'https://github.com/saltstack/salt-test-pillar-gitfs.git' on machine_id '{mach_id}'"
)
], ],
[], [],
) )