valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add timezone integration test for Solaris (#33167)

Browse Source
This commit is contained in:
Jεan Sacren 2016-05-12 15:40:37 -06:00 committed by Mike Place
parent 2d1068d2a5
commit 8685ffa2e9
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/timezone.py
View File

@ -122,7 +122,6 @@ def get_zone():
salt '*' timezone.get_zone
'''
cmd = ''
if salt.utils.which('timedatectl'):
ret = _timedatectl()
@ -295,7 +294,6 @@ def get_hwclock():
salt '*' timezone.get_hwclock
'''
cmd = ''
if salt.utils.which('timedatectl'):
ret = _timedatectl()
for line in (x.strip() for x in ret['stdout'].splitlines()):

28
tests/integration/modules/timezone.py
View File

@ -2,7 +2,7 @@
'''
Integration tests for timezone module
Only Linux is supported for the mement
Linux and Solaris are supported
'''
# Import python libs
@ -16,7 +16,7 @@ ensure_in_syspath('../../')
import integration
class TimezoneModuleTest(integration.ModuleCase):
class TimezoneLinuxModuleTest(integration.ModuleCase):
def setUp(self):
'''
Set up Linux test environment
@ -24,14 +24,30 @@ class TimezoneModuleTest(integration.ModuleCase):
ret_grain = self.run_function('grains.item', ['kernel'])
if 'Linux' not in ret_grain['kernel']:
self.skipTest('For Linux only')
super(TimezoneModuleTest, self).setUp()
super(TimezoneLinuxModuleTest, self).setUp()
def test_get_hwclock(self):
timezone = ['UTC', 'localtime']
timescale = ['UTC', 'localtime']
ret = self.run_function('timezone.get_hwclock')
self.assertIn(ret, timezone)
self.assertIn(ret, timescale)
class TimezoneSolarisModuleTest(integration.ModuleCase):
def setUp(self):
'''
Set up Solaris test environment
'''
ret_grain = self.run_function('grains.item', ['os_family'])
if 'Solaris' not in ret_grain['os_family']:
self.skipTest('For Solaris only')
super(TimezoneSolarisModuleTest, self).setUp()
def test_get_hwclock(self):
timescale = ['UTC', 'localtime']
ret = self.run_function('timezone.get_hwclock')
self.assertIn(ret, timescale)
if __name__ == '__main__':
from integration import run_tests
run_tests(TimezoneModuleTest)
run_tests([TimezoneLinuxModuleTest, TimezoneSolarisModuleTest])