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.
117 lines
3.2 KiB
Python
117 lines
3.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
integration tests for mac_ports
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import, print_function
|
|
|
|
# Import Salt Testing libs
|
|
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
|
|
class MacPortsModuleTest(ModuleCase):
|
|
'''
|
|
Validate the mac_ports module
|
|
'''
|
|
AGREE_INSTALLED = False
|
|
|
|
def setUp(self):
|
|
'''
|
|
Get current settings
|
|
'''
|
|
if not salt.utils.platform.is_darwin():
|
|
self.skipTest('Test only available on macOS')
|
|
|
|
if not salt.utils.path.which('port'):
|
|
self.skipTest('Test requires port binary')
|
|
|
|
self.AGREE_INSTALLED = 'agree' in self.run_function('pkg.list_pkgs')
|
|
self.run_function('pkg.refresh_db')
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Reset to original settings
|
|
'''
|
|
if not self.AGREE_INSTALLED:
|
|
self.run_function('pkg.remove', ['agree'])
|
|
|
|
@destructiveTest
|
|
def test_list_pkgs(self):
|
|
'''
|
|
Test pkg.list_pkgs
|
|
'''
|
|
self.run_function('pkg.install', ['agree'])
|
|
self.assertIsInstance(self.run_function('pkg.list_pkgs'), dict)
|
|
self.assertIn('agree', self.run_function('pkg.list_pkgs'))
|
|
|
|
@destructiveTest
|
|
def test_latest_version(self):
|
|
'''
|
|
Test pkg.latest_version
|
|
'''
|
|
self.run_function('pkg.install', ['agree'])
|
|
result = self.run_function('pkg.latest_version',
|
|
['agree'],
|
|
refresh=False)
|
|
self.assertIsInstance(result, dict)
|
|
self.assertIn('agree', result)
|
|
|
|
@destructiveTest
|
|
def test_remove(self):
|
|
'''
|
|
Test pkg.remove
|
|
'''
|
|
self.run_function('pkg.install', ['agree'])
|
|
removed = self.run_function('pkg.remove', ['agree'])
|
|
self.assertIsInstance(removed, dict)
|
|
self.assertIn('agree', removed)
|
|
|
|
@destructiveTest
|
|
def test_install(self):
|
|
'''
|
|
Test pkg.install
|
|
'''
|
|
self.run_function('pkg.remove', ['agree'])
|
|
installed = self.run_function('pkg.install', ['agree'])
|
|
self.assertIsInstance(installed, dict)
|
|
self.assertIn('agree', installed)
|
|
|
|
def test_list_upgrades(self):
|
|
'''
|
|
Test pkg.list_upgrades
|
|
'''
|
|
self.assertIsInstance(
|
|
self.run_function('pkg.list_upgrades', refresh=False), dict)
|
|
|
|
@destructiveTest
|
|
def test_upgrade_available(self):
|
|
'''
|
|
Test pkg.upgrade_available
|
|
'''
|
|
self.run_function('pkg.install', ['agree'])
|
|
self.assertFalse(self.run_function('pkg.upgrade_available',
|
|
['agree'],
|
|
refresh=False))
|
|
|
|
def test_refresh_db(self):
|
|
'''
|
|
Test pkg.refresh_db
|
|
'''
|
|
self.assertTrue(self.run_function('pkg.refresh_db'))
|
|
|
|
@destructiveTest
|
|
def test_upgrade(self):
|
|
'''
|
|
Test pkg.upgrade
|
|
'''
|
|
results = self.run_function('pkg.upgrade', refresh=False)
|
|
self.assertIsInstance(results, dict)
|
|
self.assertTrue(results['result'])
|