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

Fix nightly build test missed in PR 65937

Browse source
This commit is contained in:
David Murphy 2024-06-04 09:10:28 -06:00 • committed by Daniel Wozniak
parent 332379d06a
commit 00c45646d3
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/pytests/functional/utils/test_winrepo.py
View file

@ -5,6 +5,7 @@ import pytest
from salt.runners.winrepo import GLOBAL_ONLY, PER_REMOTE_ONLY, PER_REMOTE_OVERRIDES from salt.runners.winrepo import GLOBAL_ONLY, PER_REMOTE_ONLY, PER_REMOTE_OVERRIDES
from salt.utils.gitfs import GitPython, Pygit2, WinRepo from salt.utils.gitfs import GitPython, Pygit2, WinRepo
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.slow_test, pytest.mark.slow_test,
@ -130,6 +131,7 @@ def test_pygit2_remote_map(pygit2_winrepo_opts):
def _test_lock(opts): def _test_lock(opts):
mach_id = _get_machine_identifier().get("machine_id", "no_machine_id_available")
w = _get_winrepo( w = _get_winrepo(
opts, opts,
"https://github.com/saltstack/salt-test-pillar-gitfs.git", "https://github.com/saltstack/salt-test-pillar-gitfs.git",
@ -140,14 +142,18 @@ def _test_lock(opts):
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 winrepo remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'" (
f"Set update lock for winrepo remote '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 winrepo remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'" (
f"Removed update lock for winrepo remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git' on machine_id '{mach_id}'"
)
], ],
[], [],
) )