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

fix initial data structure for schedule tests

Browse source
This commit is contained in:
Vyacheslav Spiridonov 2017-03-15 21:02:08 +03:00
parent d3a2489c9c
commit 9d5db1910c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/unit/utils/schedule_test.py
View file

@ -48,7 +48,7 @@ class ScheduleTestCase(TestCase):
'''
Tests ensuring the job exists and deleting it
'''
self.schedule.opts.update({'schedule': {'foo': 'bar'}, 'pillar': ''})
self.schedule.opts.update({'schedule': {'foo': 'bar'}, 'pillar': {}})
self.assertIn('foo', self.schedule.opts['schedule'])
self.schedule.delete_job('foo')
self.assertNotIn('foo', self.schedule.opts['schedule'])
@ -57,7 +57,7 @@ class ScheduleTestCase(TestCase):
'''
Tests ignoring deletion job from pillar
'''
self.schedule.opts.update({'pillar': {'schedule': {'foo': 'bar'}}, 'schedule': ''})
self.schedule.opts.update({'pillar': {'schedule': {'foo': 'bar'}}, 'schedule': {}})
self.assertIn('foo', self.schedule.opts['pillar']['schedule'])
self.schedule.delete_job('foo')
self.assertIn('foo', self.schedule.opts['pillar']['schedule'])
@ -66,7 +66,7 @@ class ScheduleTestCase(TestCase):
'''
Tests removing job from intervals
'''
self.schedule.opts.update({'pillar': '', 'schedule': ''})
self.schedule.opts.update({'pillar': {}, 'schedule': {}})
self.schedule.intervals = {'foo': 'bar'}
self.schedule.delete_job('foo')
self.assertNotIn('foo', self.schedule.intervals)
@ -76,7 +76,7 @@ class ScheduleTestCase(TestCase):
Tests ensuring jobs exists and deleting them by prefix
'''
self.schedule.opts.update({'schedule': {'foobar': 'bar', 'foobaz': 'baz', 'fooboo': 'boo'},
'pillar': ''})
'pillar': {}})
ret = copy.deepcopy(self.schedule.opts)
del ret['schedule']['foobar']
del ret['schedule']['foobaz']
@ -88,7 +88,7 @@ class ScheduleTestCase(TestCase):
Tests ignoring deletion jobs by prefix from pillar
'''
self.schedule.opts.update({'pillar': {'schedule': {'foobar': 'bar', 'foobaz': 'baz', 'fooboo': 'boo'}},
'schedule': ''})
'schedule': {}})
ret = copy.deepcopy(self.schedule.opts)
self.schedule.delete_job_prefix('fooba')
self.assertEqual(self.schedule.opts, ret)
@ -117,9 +117,9 @@ class ScheduleTestCase(TestCase):
ret = copy.deepcopy(self.schedule.opts)
ret.update({'schedule': {'foo': {'bar': 'baz', 'enabled': True},
'hello': {'world': 'peace', 'enabled': True}},
'pillar': ''})
'pillar': {}})
self.schedule.opts.update({'schedule': {'hello': {'world': 'peace', 'enabled': True}},
'pillar': ''})
'pillar': {}})
Schedule.add_job(self.schedule, data)
self.assertEqual(self.schedule.opts, ret)