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

Add timeouts and account for those in assert

Browse source
This commit is contained in:
twangboy 2019-07-26 11:49:36 -06:00
parent d3a160edd5
commit a9e9c97dca
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -413,14 +413,14 @@ class WinSystemModuleTest(ModuleCase):
'''
Test getting the system time
'''
time_now = datetime.datetime.now()
# 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')
ret = self.run_function('system.get_system_time', timeout=300)
# 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))
@ -428,8 +428,9 @@ class WinSystemModuleTest(ModuleCase):
# 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)
diff = time_sys - time_now
# Timeouts are set to 300 seconds. We're adding a 30 second buffer
self.assertTrue(diff.seconds < 330)
@skipIf(True, 'WAR ROOM 7/18/2019, unit test?')
@destructiveTest