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

Removing extra newline from changelog. removing debugging messages from conftest.py.

Browse source
This commit is contained in:
Gareth J. Greenaway 2021-06-21 16:26:22 -07:00 • committed by Megan Wilhite
parent 9c5b2e369a
commit 88769f2058
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/49115.fixed
View file

@ -1,2 +1 @@
Fixing rabbitmq.list_user_permissions to ensure we are returning a permission list with three elements even when some values are empty.

4
tests/pytests/functional/states/rabbitmq/conftest.py
View file

@ -75,21 +75,17 @@ def rabbitmq_container(request, salt_factories, modules):
)
with container.started():
# Sleep
log.debug("=== initial sleep")
time.sleep(10)
authenticated = False
login_attempts = 6
while login_attempts:
log.debug("=== login attempt %s ===", login_attempts)
login_attempts -= 1
ret = container.run("rabbitmqctl status --formatter=json")
log.debug("=== ret %s ===", ret)
authenticated = ret.exitcode == 0
if authenticated:
break
log.debug("=== sleep ===")
time.sleep(10)
if authenticated: