mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +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.
99 lines
3.1 KiB
Python
99 lines
3.1 KiB
Python
# coding: utf-8
|
|
|
|
# Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Salt libs
|
|
import salt.beacons.glxinfo as glxinfo
|
|
|
|
# Salt testing libs
|
|
from tests.support.unit import skipIf, TestCase
|
|
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, Mock
|
|
|
|
# Import test suite libs
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class GLXInfoBeaconTestCase(TestCase, LoaderModuleMockMixin):
|
|
'''
|
|
Test case for salt.beacons.glxinfo
|
|
'''
|
|
|
|
def setup_loader_modules(self):
|
|
return {glxinfo: {'last_state': {}}}
|
|
|
|
def test_no_adb_command(self):
|
|
with patch('salt.utils.path.which') as mock:
|
|
mock.return_value = None
|
|
|
|
ret = glxinfo.__virtual__()
|
|
|
|
mock.assert_called_once_with('glxinfo')
|
|
self.assertFalse(ret)
|
|
|
|
def test_with_adb_command(self):
|
|
with patch('salt.utils.path.which') as mock:
|
|
mock.return_value = '/usr/bin/glxinfo'
|
|
|
|
ret = glxinfo.__virtual__()
|
|
|
|
mock.assert_called_once_with('glxinfo')
|
|
self.assertEqual(ret, 'glxinfo')
|
|
|
|
def test_non_dict_config(self):
|
|
config = []
|
|
|
|
log_mock = Mock()
|
|
with patch.object(glxinfo, 'log', log_mock):
|
|
ret = glxinfo.beacon(config)
|
|
|
|
self.assertEqual(ret, [])
|
|
|
|
def test_no_user(self):
|
|
config = {'screen_event': True}
|
|
|
|
log_mock = Mock()
|
|
with patch.object(glxinfo, 'log', log_mock):
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [])
|
|
|
|
def test_screen_state(self):
|
|
config = {'screen_event': True, 'user': 'frank'}
|
|
|
|
mock = Mock(return_value=0)
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [{'tag': 'screen_event', 'screen_available': True}])
|
|
mock.assert_called_once_with('DISPLAY=:0 glxinfo', runas='frank', python_shell=True)
|
|
|
|
def test_screen_state_missing(self):
|
|
config = {'screen_event': True, 'user': 'frank'}
|
|
|
|
mock = Mock(return_value=255)
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [{'tag': 'screen_event', 'screen_available': False}])
|
|
|
|
def test_screen_state_no_repeat(self):
|
|
config = {'screen_event': True, 'user': 'frank'}
|
|
|
|
mock = Mock(return_value=255)
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [{'tag': 'screen_event', 'screen_available': False}])
|
|
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [])
|
|
|
|
def test_screen_state_change(self):
|
|
config = {'screen_event': True, 'user': 'frank'}
|
|
|
|
mock = Mock(side_effect=[255, 0])
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [{'tag': 'screen_event', 'screen_available': False}])
|
|
|
|
ret = glxinfo.beacon(config)
|
|
self.assertEqual(ret, [{'tag': 'screen_event', 'screen_available': True}])
|