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

Fix failing package tests

Browse source
This commit is contained in:
Shane Lee 2024-03-21 09:55:48 -06:00 • committed by Pedro Algarvio
parent 017f714e96
commit 87d3344a7a
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/modules/win_useradd.py
View file

@ -122,7 +122,10 @@ def add(
user_info["name"] = str(name)
else:
return False
user_info["password"] = str(password)
if password:
user_info["password"] = str(password)
else:
user_info["password"] = None
user_info["priv"] = win32netcon.USER_PRIV_USER
user_info["home_dir"] = home
user_info["comment"] = description
@ -234,6 +237,8 @@ def update(
# Update the user object with new settings
if password:
user_info["password"] = str(password)
else:
user_info["password"] = None
if home:
user_info["home_dir"] = home
if homedrive:

16
tests/support/pytest/helpers.py
View file

@ -63,7 +63,7 @@ def temp_state_file(name, contents, saltenv="base", strip_first_newline=True):
saltenv(str):
The salt env to use. Either ``base`` or ``prod``
strip_first_newline(bool):
Wether to strip the initial first new line char or not.
Whether to strip the initial first new line char or not.
"""
if saltenv == "base":
@ -109,7 +109,7 @@ def temp_pillar_file(name, contents, saltenv="base", strip_first_newline=True):
saltenv(str):
The salt env to use. Either ``base`` or ``prod``
strip_first_newline(bool):
Wether to strip the initial first new line char or not.
Whether to strip the initial first new line char or not.
"""
if saltenv == "base":
@ -236,7 +236,7 @@ class TestGroup:
self._delete_group = True
log.debug("Created system group: %s", self)
else:
log.debug("Reusing exising system group: %s", self)
log.debug("Reusing existing system group: %s", self)
if self.members:
ret = self.sminion.functions.group.members(
self.name, members_list=self.members
@ -325,14 +325,14 @@ class TestAccount:
if not self.sminion.functions.user.info(self.username):
log.debug("Creating system account: %s", self)
ret = self.sminion.functions.user.add(self.username)
assert ret
assert ret is True
self._delete_account = True
if salt.utils.platform.is_darwin() or salt.utils.platform.is_windows():
password = self.password
else:
password = self.hashed_password
ret = self.sminion.functions.shadow.set_password(self.username, password)
assert ret
assert ret is True
assert self.username in self.sminion.functions.user.list_users()
if self._group:
self.group.__enter__()
@ -344,7 +344,7 @@ class TestAccount:
if self._delete_account:
log.debug("Created system account: %s", self)
else:
log.debug("Reusing exisintg system account: %s", self)
log.debug("Reusing existing system account: %s", self)
# Run tests
return self
@ -700,7 +700,7 @@ class EntropyGenerator:
kernel_entropy_file = pathlib.Path("/proc/sys/kernel/random/entropy_avail")
kernel_poolsize_file = pathlib.Path("/proc/sys/kernel/random/poolsize")
if not kernel_entropy_file.exists():
log.info("The '%s' file is not avilable", kernel_entropy_file)
log.info("The '%s' file is not available", kernel_entropy_file)
return
self.current_entropy = int(
@ -709,7 +709,7 @@ class EntropyGenerator:
log.info("Available Entropy: %s", self.current_entropy)
if not kernel_poolsize_file.exists():
log.info("The '%s' file is not avilable", kernel_poolsize_file)
log.info("The '%s' file is not available", kernel_poolsize_file)
else:
self.current_poolsize = int(
kernel_poolsize_file.read_text(encoding="utf-8").strip()