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

Update test to work with new config option

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-03-25 00:51:00 -07:00 • committed by Pedro Algarvio
parent 58b02266de
commit 892fbad749
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/pytests/unit/test_master.py
View file

@ -27,7 +27,7 @@ def test_maintenance_duration():
"""
opts = {
"loop_interval": 10,
"maintenence_interval": 1,
"maintenance_interval": 1,
"cachedir": "/tmp",
"sock_dir": "/tmp",
"maintenance_niceness": 1,

12
tests/unit/test_master.py
View file

@ -681,7 +681,9 @@ class MaintenanceTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
"""
def setUp(self):
opts = self.get_temp_config("master", git_pillar_update_interval=180)
opts = self.get_temp_config(
"master", git_pillar_update_interval=180, maintenance_interval=181
)
self.main_class = salt.master.Maintenance(opts)
self.main_class._after_fork_methods = self.main_class._finalize_methods = []
@ -758,10 +760,10 @@ class MaintenanceTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
self.assertEqual(str(exc), "Time passes")
self.assertEqual(mocked_time._calls, [60] * 4)
self.assertEqual(mocked__post_fork_init.call_times, [0])
self.assertEqual(mocked_clean_old_jobs.call_times, [60, 120, 180])
self.assertEqual(mocked_clean_expired_tokens.call_times, [60, 120, 180])
self.assertEqual(mocked_clean_pub_auth.call_times, [60, 120, 180])
self.assertEqual(mocked_handle_git_pillar.call_times, [0, 180])
self.assertEqual(mocked_clean_old_jobs.call_times, [0, 120, 180])
self.assertEqual(mocked_clean_expired_tokens.call_times, [0, 120, 180])
self.assertEqual(mocked_clean_pub_auth.call_times, [0, 120, 180])
self.assertEqual(mocked_handle_git_pillar.call_times, [0])
self.assertEqual(mocked_handle_schedule.call_times, [0, 60, 120, 180])
self.assertEqual(mocked_handle_key_cache.call_times, [0, 60, 120, 180])
self.assertEqual(mocked_handle_presence.call_times, [0, 60, 120, 180])