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.
181 lines
5.8 KiB
Python
181 lines
5.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
integration tests for mac_softwareupdate
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import skipIf
|
|
from tests.support.case import ModuleCase
|
|
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('softwareupdate'), '\'softwareupdate\' binary not found in $PATH')
|
|
class MacSoftwareUpdateModuleTest(ModuleCase):
|
|
'''
|
|
Validate the mac_softwareupdate module
|
|
'''
|
|
IGNORED_LIST = []
|
|
SCHEDULE = False
|
|
CATALOG = ''
|
|
|
|
def setUp(self):
|
|
'''
|
|
Get current settings
|
|
'''
|
|
self.IGNORED_LIST = self.run_function('softwareupdate.list_ignored')
|
|
self.SCHEDULE = self.run_function('softwareupdate.schedule')
|
|
self.CATALOG = self.run_function('softwareupdate.get_catalog')
|
|
|
|
super(MacSoftwareUpdateModuleTest, self).setUp()
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Reset to original settings
|
|
'''
|
|
if self.IGNORED_LIST:
|
|
for item in self.IGNORED_LIST:
|
|
self.run_function('softwareupdate.ignore', [item])
|
|
else:
|
|
self.run_function('softwareupdate.reset_ignored')
|
|
|
|
self.run_function('softwareupdate.schedule', [self.SCHEDULE])
|
|
|
|
if self.CATALOG == 'Default':
|
|
self.run_function('softwareupdate.reset_catalog')
|
|
else:
|
|
self.run_function('softwareupdate.set_catalog', [self.CATALOG])
|
|
|
|
super(MacSoftwareUpdateModuleTest, self).tearDown()
|
|
|
|
def test_list_available(self):
|
|
'''
|
|
Test softwareupdate.list_available
|
|
'''
|
|
# Can't predict what will be returned, so can only test that the return
|
|
# is the correct type, dict
|
|
self.assertIsInstance(
|
|
self.run_function('softwareupdate.list_available'), dict)
|
|
|
|
@destructiveTest
|
|
def test_ignore(self):
|
|
'''
|
|
Test softwareupdate.ignore
|
|
Test softwareupdate.list_ignored
|
|
Test softwareupdate.reset_ignored
|
|
'''
|
|
# Test reset_ignored
|
|
self.assertTrue(self.run_function('softwareupdate.reset_ignored'))
|
|
self.assertEqual(self.run_function('softwareupdate.list_ignored'), [])
|
|
|
|
# Test ignore
|
|
self.assertTrue(
|
|
self.run_function('softwareupdate.ignore', ['spongebob']))
|
|
self.assertTrue(
|
|
self.run_function('softwareupdate.ignore', ['squidward']))
|
|
|
|
# Test list_ignored and verify ignore
|
|
self.assertIn(
|
|
'spongebob',
|
|
self.run_function('softwareupdate.list_ignored'))
|
|
self.assertIn(
|
|
'squidward',
|
|
self.run_function('softwareupdate.list_ignored'))
|
|
|
|
@destructiveTest
|
|
def test_schedule(self):
|
|
'''
|
|
Test softwareupdate.schedule_enable
|
|
Test softwareupdate.schedule_enabled
|
|
'''
|
|
# Test enable
|
|
self.assertTrue(
|
|
self.run_function('softwareupdate.schedule_enable', [True]))
|
|
self.assertTrue(self.run_function('softwareupdate.schedule_enabled'))
|
|
|
|
# Test disable in case it was already enabled
|
|
self.assertTrue(
|
|
self.run_function('softwareupdate.schedule_enable', [False]))
|
|
self.assertFalse(self.run_function('softwareupdate.schedule_enabled'))
|
|
|
|
@destructiveTest
|
|
def test_update(self):
|
|
'''
|
|
Test softwareupdate.update_all
|
|
Test softwareupdate.update
|
|
Test softwareupdate.update_available
|
|
|
|
Need to know the names of updates that are available to properly test
|
|
the update functions...
|
|
'''
|
|
# There's no way to know what the dictionary will contain, so all we can
|
|
# check is that the return is a dictionary
|
|
self.assertIsInstance(
|
|
self.run_function('softwareupdate.update_all'), dict)
|
|
|
|
# Test update_available
|
|
self.assertFalse(
|
|
self.run_function('softwareupdate.update_available', ['spongebob']))
|
|
|
|
# Test update not available
|
|
self.assertIn(
|
|
'Update not available',
|
|
self.run_function('softwareupdate.update', ['spongebob']))
|
|
|
|
def test_list_downloads(self):
|
|
'''
|
|
Test softwareupdate.list_downloads
|
|
'''
|
|
self.assertIsInstance(
|
|
self.run_function('softwareupdate.list_downloads'), list)
|
|
|
|
@destructiveTest
|
|
def test_download(self):
|
|
'''
|
|
Test softwareupdate.download
|
|
|
|
Need to know the names of updates that are available to properly test
|
|
the download function
|
|
'''
|
|
# Test update not available
|
|
self.assertIn(
|
|
'Update not available',
|
|
self.run_function('softwareupdate.download', ['spongebob']))
|
|
|
|
@destructiveTest
|
|
def test_download_all(self):
|
|
'''
|
|
Test softwareupdate.download_all
|
|
'''
|
|
self.assertIsInstance(
|
|
self.run_function('softwareupdate.download_all'), list)
|
|
|
|
@destructiveTest
|
|
def test_get_set_reset_catalog(self):
|
|
'''
|
|
Test softwareupdate.download_all
|
|
'''
|
|
# Reset the catalog
|
|
self.assertTrue(self.run_function('softwareupdate.reset_catalog'))
|
|
self.assertEqual(self.run_function('softwareupdate.get_catalog'),
|
|
'Default')
|
|
|
|
# Test setting and getting the catalog
|
|
self.assertTrue(
|
|
self.run_function('softwareupdate.set_catalog', ['spongebob']))
|
|
self.assertEqual(
|
|
self.run_function('softwareupdate.get_catalog'), 'spongebob')
|
|
|
|
# Test reset the catalog
|
|
self.assertTrue(self.run_function('softwareupdate.reset_catalog'))
|
|
self.assertEqual(self.run_function('softwareupdate.get_catalog'),
|
|
'Default')
|