Skip to content
This repository has been archived by the owner on Apr 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1 from waynew/pull/54777-callback-typo
Browse files Browse the repository at this point in the history
Add tests
  • Loading branch information
javierbertoli authored Sep 26, 2019
2 parents c19d0b0 + a57f7d0 commit dd86c46
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions tests/unit/test_minion.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,29 @@ def test_scheduler_before_connect(self):
finally:
minion.destroy()

def test_when_ping_interval_is_set_the_callback_should_be_added_to_periodic_callbacks(self):
with patch('salt.minion.Minion.ctx', MagicMock(return_value={})), \
patch('salt.minion.Minion.sync_connect_master', MagicMock(side_effect=RuntimeError('stop execution'))), \
patch('salt.utils.process.SignalHandlingMultiprocessingProcess.start', MagicMock(return_value=True)), \
patch('salt.utils.process.SignalHandlingMultiprocessingProcess.join', MagicMock(return_value=True)):
mock_opts = self.get_config('minion', from_scratch=True)
mock_opts['ping_interval'] = 10
io_loop = tornado.ioloop.IOLoop()
io_loop.make_current()
minion = salt.minion.Minion(mock_opts, io_loop=io_loop)
try:
try:
minion.connected = MagicMock(side_effect=(False, True))
minion._fire_master_minion_start = MagicMock()
minion.tune_in(start=False)
except RuntimeError:
pass

# Make sure the scheduler is initialized but the beacons are not
self.assertTrue('ping' in minion.periodic_callbacks)
finally:
minion.destroy()

def test_minion_retry_dns_count(self):
'''
Tests that the resolve_dns will retry dns look ups for a maximum of
Expand Down

0 comments on commit dd86c46

Please sign in to comment.