mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
3184168365
This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
211 lines
7.8 KiB
Python
211 lines
7.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
Integration tests for mac_timezone
|
|
|
|
If using parallels, make sure Time sync is turned off. Otherwise, parallels will
|
|
keep changing your date/time settings while the tests are running. To turn off
|
|
Time sync do the following:
|
|
- Go to actions -> configure
|
|
- Select options at the top and 'More Options' on the left
|
|
- Set time to 'Do not sync'
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import datetime
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import destructiveTest, skip_if_not_root
|
|
|
|
# Import Salt libs
|
|
import salt.utils.path
|
|
import salt.utils.platform
|
|
|
|
|
|
@skip_if_not_root
|
|
@skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
|
|
@skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
|
|
class MacTimezoneModuleTest(ModuleCase):
|
|
'''
|
|
Validate the mac_timezone module
|
|
'''
|
|
USE_NETWORK_TIME = False
|
|
TIME_SERVER = 'time.apple.com'
|
|
TIME_ZONE = ''
|
|
CURRENT_DATE = ''
|
|
CURRENT_TIME = ''
|
|
|
|
def setUp(self):
|
|
'''
|
|
Get current settings
|
|
'''
|
|
self.USE_NETWORK_TIME = self.run_function('timezone.get_using_network_time')
|
|
self.TIME_SERVER = self.run_function('timezone.get_time_server')
|
|
self.TIME_ZONE = self.run_function('timezone.get_zone')
|
|
self.CURRENT_DATE = self.run_function('timezone.get_date')
|
|
self.CURRENT_TIME = self.run_function('timezone.get_time')
|
|
|
|
self.run_function('timezone.set_using_network_time', [False])
|
|
self.run_function('timezone.set_zone', ['America/Denver'])
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Reset to original settings
|
|
'''
|
|
self.run_function('timezone.set_time_server', [self.TIME_SERVER])
|
|
self.run_function('timezone.set_using_network_time',
|
|
[self.USE_NETWORK_TIME])
|
|
self.run_function('timezone.set_zone', [self.TIME_ZONE])
|
|
if not self.USE_NETWORK_TIME:
|
|
self.run_function('timezone.set_date', [self.CURRENT_DATE])
|
|
self.run_function('timezone.set_time', [self.CURRENT_TIME])
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_get_set_date(self):
|
|
'''
|
|
Test timezone.get_date
|
|
Test timezone.set_date
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('timezone.set_date', ['2/20/2011']))
|
|
self.assertEqual(self.run_function('timezone.get_date'), '2/20/2011')
|
|
|
|
# Test bad date format
|
|
self.assertEqual(
|
|
self.run_function('timezone.set_date', ['13/12/2014']),
|
|
'ERROR executing \'timezone.set_date\': '
|
|
'Invalid Date/Time Format: 13/12/2014'
|
|
)
|
|
|
|
def test_get_time(self):
|
|
'''
|
|
Test timezone.get_time
|
|
'''
|
|
text_time = self.run_function('timezone.get_time')
|
|
self.assertNotEqual(text_time, 'Invalid Timestamp')
|
|
obj_date = datetime.datetime.strptime(text_time, '%H:%M:%S')
|
|
self.assertIsInstance(obj_date, datetime.date)
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_set_time(self):
|
|
'''
|
|
Test timezone.set_time
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(self.run_function('timezone.set_time', ['3:14']))
|
|
|
|
# Test bad time format
|
|
self.assertEqual(
|
|
self.run_function('timezone.set_time', ['3:71']),
|
|
'ERROR executing \'timezone.set_time\': '
|
|
'Invalid Date/Time Format: 3:71')
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_get_set_zone(self):
|
|
'''
|
|
Test timezone.get_zone
|
|
Test timezone.set_zone
|
|
'''
|
|
# Correct Functionality
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_zone', ['Pacific/Wake']))
|
|
self.assertEqual(
|
|
self.run_function('timezone.get_zone'), 'Pacific/Wake')
|
|
|
|
# Test bad time zone
|
|
self.assertEqual(
|
|
self.run_function('timezone.set_zone', ['spongebob']),
|
|
'ERROR executing \'timezone.set_zone\': '
|
|
'Invalid Timezone: spongebob')
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_get_offset(self):
|
|
'''
|
|
Test timezone.get_offset
|
|
'''
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_zone', ['Pacific/Wake']))
|
|
self.assertIsInstance(self.run_function('timezone.get_offset'), str)
|
|
self.assertEqual(self.run_function('timezone.get_offset'), '+1200')
|
|
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_zone', ['America/Los_Angeles']))
|
|
self.assertIsInstance(self.run_function('timezone.get_offset'), str)
|
|
self.assertEqual(self.run_function('timezone.get_offset'), '-0700')
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_get_set_zonecode(self):
|
|
'''
|
|
Test timezone.get_zonecode
|
|
Test timezone.set_zonecode
|
|
'''
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_zone', ['America/Los_Angeles']))
|
|
self.assertIsInstance(self.run_function('timezone.get_zonecode'), str)
|
|
self.assertEqual(self.run_function('timezone.get_zonecode'), 'PDT')
|
|
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_zone', ['Pacific/Wake']))
|
|
self.assertIsInstance(self.run_function('timezone.get_zonecode'), str)
|
|
self.assertEqual(self.run_function('timezone.get_zonecode'), 'WAKT')
|
|
|
|
def test_list_zones(self):
|
|
'''
|
|
Test timezone.list_zones
|
|
'''
|
|
zones = self.run_function('timezone.list_zones')
|
|
self.assertIsInstance(self.run_function('timezone.list_zones'), list)
|
|
self.assertIn(
|
|
'America/Denver',
|
|
self.run_function('timezone.list_zones'))
|
|
self.assertIn(
|
|
'America/Los_Angeles',
|
|
self.run_function('timezone.list_zones'))
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_zone_compare(self):
|
|
'''
|
|
Test timezone.zone_compare
|
|
'''
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_zone', ['America/Denver']))
|
|
self.assertTrue(
|
|
self.run_function('timezone.zone_compare', ['America/Denver']))
|
|
self.assertFalse(
|
|
self.run_function('timezone.zone_compare', ['Pacific/Wake']))
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_get_set_using_network_time(self):
|
|
'''
|
|
Test timezone.get_using_network_time
|
|
Test timezone.set_using_network_time
|
|
'''
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_using_network_time', [True]))
|
|
self.assertTrue(self.run_function('timezone.get_using_network_time'))
|
|
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_using_network_time', [False]))
|
|
self.assertFalse(self.run_function('timezone.get_using_network_time'))
|
|
|
|
@skipIf(True, 'Skip until we can figure out why modifying the system clock causes ZMQ errors')
|
|
@destructiveTest
|
|
def test_get_set_time_server(self):
|
|
'''
|
|
Test timezone.get_time_server
|
|
Test timezone.set_time_server
|
|
'''
|
|
self.assertTrue(
|
|
self.run_function('timezone.set_time_server', ['spongebob.com']))
|
|
self.assertEqual(
|
|
self.run_function('timezone.get_time_server'), 'spongebob.com')
|