Skip to content

Fix failing beacon test #68691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
twangboy wants to merge 1 commit into
base: 3007.x
Choose a base branch
from
Open

Fix failing beacon test #68691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions tests/pytests/unit/test_minion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,8 @@ def test_minion_module_refresh_beacons_refresh(minion_opts):
assert "service.beacon" in minion.beacons.beacons
minion.destroy()
finally:
minion.destroy()
if minion is not None:
minion.destroy()


def test_beacons_refresh_preserves_interval_map(minion_opts):
Expand All @@ -650,10 +651,11 @@ def test_beacons_refresh_preserves_interval_map(minion_opts):
"salt.utils.process.SignalHandlingProcess.join",
MagicMock(return_value=True),
):
minion = None
try:
minion = salt.minion.Minion(
minion_opts,
io_loop=salt.ext.tornado.ioloop.IOLoop(),
io_loop=tornado.ioloop.IOLoop.current(),
)
minion.schedule = salt.utils.schedule.Schedule(
minion_opts, {}, returners={}
Expand All @@ -677,7 +679,8 @@ def test_beacons_refresh_preserves_interval_map(minion_opts):
assert minion.beacons.interval_map["diskusage"] == 30

finally:
minion.destroy()
if minion is not None:
minion.destroy()


@pytest.mark.slow_test
Expand Down
Loading