simplify timezone module unit test mocks

This commit is contained in:
Justin Findlay 2015-11-03 19:37:54 -07:00
parent 476b651c94
commit 11a9a5868f

View File

@ -107,8 +107,8 @@ class TimezoneTestCase(TestCase):
'''
def zone_checking_and_unlinking():
ret = ('Zone does not exist: /usr/share/lib/zoneinfo/timezone')
mock = MagicMock(side_effect=[False, True, True])
with patch.object(os.path, 'exists', mock):
mock_exists = MagicMock(side_effect=[False, True, True])
with patch.object(os.path, 'exists', mock_exists):
self.assertEqual(timezone.set_zone('timezone'), ret)
with patch.object(os, 'unlink', return_value=None):
@ -164,6 +164,9 @@ class TimezoneTestCase(TestCase):
'''
Test to get current hardware clock setting (UTC or localtime)
'''
mock_t = MagicMock(return_value=True)
mock_f = MagicMock(return_value=False)
with patch.object(salt.utils, 'which', return_value=True):
with patch.object(timezone, '_timedatectl',
MagicMock(return_value={'stdout': 'rtc in local tz:yes\n'})):
@ -210,8 +213,7 @@ class TimezoneTestCase(TestCase):
mfile.return_value.__iter__.return_value = [fl_data]
self.assertEqual(timezone.get_hwclock(), 'UTC')
mock = MagicMock(return_value=True)
with patch.object(os.path, 'isfile', mock):
with patch.object(os.path, 'isfile', mock_t):
fl_data = 'zone_info=GMT'
with patch('salt.utils.fopen',
mock_open(read_data=fl_data),
@ -222,8 +224,7 @@ class TimezoneTestCase(TestCase):
{'os_family': 'Solaris'}):
self.assertEqual(timezone.get_hwclock(), 'UTC')
mock = MagicMock(return_value=True)
with patch.object(os.path, 'isfile', mock):
with patch.object(os.path, 'isfile', mock_t):
fl_data = 'A=GMT'
with patch('salt.utils.fopen',
mock_open(read_data=fl_data),
@ -236,8 +237,7 @@ class TimezoneTestCase(TestCase):
with patch.object(salt.utils, 'which', return_value=False):
with patch.dict(timezone.__grains__, {'os_family': 'Solaris'}):
mock = MagicMock(return_value=False)
with patch.object(os.path, 'isfile', mock):
with patch.object(os.path, 'isfile', mock_f):
self.assertEqual(timezone.get_hwclock(), 'UTC')
def test_set_hwclock(self):
@ -245,8 +245,8 @@ class TimezoneTestCase(TestCase):
Test to sets the hardware clock to be either UTC or localtime
'''
zone = 'America/Denver'
with patch.object(timezone, 'get_zone', return_value=zone):
with patch.object(timezone, 'get_zone', return_value=zone):
with patch.dict(timezone.__grains__, {'os_family': 'Solaris',
'cpuarch': 'sparc'}):
self.assertRaises(