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 some tests in the Windows Class

Browse source 
Try to account for the fact that the system time may be obtained just as
the clock increments minutes
Make sure the w32time service is stopped by wrapping it in some asserts
and checking the status of the service after stopping
Put the service.stop inside the try/finally block so that it will be
restarted after if something fails
This commit is contained in:
twangboy 2019-07-05 18:23:23 -06:00
parent becaf12983
commit 6a685bda93
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tests/integration/modules/test_system.py
View file

@ -406,9 +406,23 @@ class WinSystemModuleTest(ModuleCase):
'''
Test getting the system time
'''
# We have to do some datetime fu to account for the possibility that the
# system time will be obtained just before the minutes increment
ret = self.run_function('system.get_system_time')
now = datetime.datetime.now()
self.assertEqual(now.strftime("%I:%M"), ret.rsplit(':', 1)[0])
# Split out time and AM/PM
sys_time, meridian = ret.split(' ')
h, m, s = sys_time.split(':')
# Get the current time
time_now = datetime.datetime.now()
# Use the system time to generate a datetime object for the system time
# with the same date
time_sys = time_now.replace(hour=int(h), minute=int(m), second=int(s))
# get_system_time returns a non 24 hour time
# Lets make it 24 hour time
if meridian == 'PM':
time_sys = time_sys + datetime.timedelta(hours=12)
diff = time_now - time_sys
self.assertTrue(diff.seconds < 60)
@destructiveTest
def test_set_system_time(self):
@ -420,10 +434,11 @@ class WinSystemModuleTest(ModuleCase):
In order for this test to pass, time sync must be disabled for the
VM in the hypervisor
'''
self.run_function('service.stop', ['w32time'])
test_time = '10:55'
current_time = self.run_function('system.get_system_time')
try:
self.assertTrue(self.run_function('service.stop', ['w32time']))
self.assertFalse(self.run_function('service.status', ['w32time']))
test_time = '10:55'
current_time = self.run_function('system.get_system_time')
self.run_function('system.set_system_time', [test_time + ' AM'])
get_time = self.run_function('system.get_system_time').rsplit(':', 1)[0]
self.assertEqual(get_time, test_time)
@ -449,9 +464,12 @@ class WinSystemModuleTest(ModuleCase):
In order for this test to pass, time sync must be disabled for the
VM in the hypervisor
'''
self.run_function('service.stop', ['w32time'])
current_date = self.run_function('system.get_system_date')
try:
# If the test still fails, the hypervisor may be maintaining time
# sync
self.assertTrue(self.run_function('service.stop', ['w32time']))
self.assertFalse(self.run_function('service.status', ['w32time']))
current_date = self.run_function('system.get_system_date')
self.run_function('system.set_system_date', ['03/25/2018'])
ret = self.run_function('system.get_system_date')
self.assertEqual(ret, '03/25/2018')