2016-01-06 12:55:38 +00:00
|
|
|
# coding: utf-8
|
|
|
|
|
|
|
|
# Python libs
|
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
|
|
# Salt libs
|
2017-02-19 15:42:29 +00:00
|
|
|
import salt.beacons.glxinfo as glxinfo
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
# Salt testing libs
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import skipIf, TestCase
|
|
|
|
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, Mock
|
2016-01-06 12:55:38 +00:00
|
|
|
|
2017-02-19 15:42:29 +00:00
|
|
|
# Import test suite libs
|
2017-02-24 19:02:08 +00:00
|
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-02-19 15:42:29 +00:00
|
|
|
class GLXInfoBeaconTestCase(TestCase, LoaderModuleMockMixin):
|
2016-01-06 12:55:38 +00:00
|
|
|
'''
|
|
|
|
Test case for salt.beacons.glxinfo
|
|
|
|
'''
|
2017-03-22 12:12:36 +00:00
|
|
|
|
|
|
|
def setup_loader_modules(self):
|
|
|
|
return {glxinfo: {'last_state': {}}}
|
2016-01-06 12:55:38 +00:00
|
|
|
|
2017-06-23 17:18:49 +00:00
|
|
|
def test_no_glxinfo_command(self):
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
with patch('salt.utils.path.which') as mock:
|
2016-01-06 12:55:38 +00:00
|
|
|
mock.return_value = None
|
|
|
|
|
|
|
|
ret = glxinfo.__virtual__()
|
|
|
|
|
|
|
|
mock.assert_called_once_with('glxinfo')
|
|
|
|
self.assertFalse(ret)
|
|
|
|
|
2017-06-23 17:18:49 +00:00
|
|
|
def test_with_glxinfo_command(self):
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
with patch('salt.utils.path.which') as mock:
|
2016-01-06 12:55:38 +00:00
|
|
|
mock.return_value = '/usr/bin/glxinfo'
|
|
|
|
|
|
|
|
ret = glxinfo.__virtual__()
|
|
|
|
|
|
|
|
mock.assert_called_once_with('glxinfo')
|
|
|
|
self.assertEqual(ret, 'glxinfo')
|
|
|
|
|
2017-06-23 17:18:49 +00:00
|
|
|
def test_non_list_config(self):
|
|
|
|
config = {}
|
2016-01-06 12:55:38 +00:00
|
|
|
|
2017-06-23 17:18:49 +00:00
|
|
|
ret = glxinfo.validate(config)
|
2016-01-06 12:55:38 +00:00
|
|
|
|
2017-06-23 17:18:49 +00:00
|
|
|
self.assertEqual(ret, (False, 'Configuration for glxinfo '
|
|
|
|
'beacon must be a list.'))
|
2016-01-06 12:55:38 +00:00
|
|
|
|
2016-01-07 14:49:32 +00:00
|
|
|
def test_no_user(self):
|
2017-06-23 17:18:49 +00:00
|
|
|
config = [{'screen_event': True}]
|
2016-01-06 12:55:38 +00:00
|
|
|
|
2017-06-23 17:18:49 +00:00
|
|
|
_expected = (False, 'Configuration for glxinfo beacon must '
|
|
|
|
'include a user as glxinfo is not '
|
|
|
|
'available to root.')
|
|
|
|
ret = glxinfo.validate(config)
|
|
|
|
self.assertEqual(ret, _expected)
|
2016-01-07 14:49:32 +00:00
|
|
|
|
|
|
|
def test_screen_state(self):
|
2017-06-23 17:18:49 +00:00
|
|
|
config = [{'screen_event': True,
|
|
|
|
'user': 'frank'}]
|
2016-01-07 14:49:32 +00:00
|
|
|
|
2016-01-06 12:55:38 +00:00
|
|
|
mock = Mock(return_value=0)
|
|
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
2017-06-23 17:18:49 +00:00
|
|
|
|
|
|
|
ret = glxinfo.validate(config)
|
|
|
|
self.assertEqual(ret, (True, 'Valid beacon configuration'))
|
|
|
|
|
2016-01-06 12:55:38 +00:00
|
|
|
ret = glxinfo.beacon(config)
|
2017-06-23 17:18:49 +00:00
|
|
|
self.assertEqual(ret, [{'tag': 'screen_event',
|
|
|
|
'screen_available': True}])
|
|
|
|
mock.assert_called_once_with('DISPLAY=:0 glxinfo',
|
|
|
|
runas='frank', python_shell=True)
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
def test_screen_state_missing(self):
|
2017-06-23 17:18:49 +00:00
|
|
|
config = [{'screen_event': True, 'user': 'frank'}]
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
mock = Mock(return_value=255)
|
|
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
2017-06-23 17:18:49 +00:00
|
|
|
ret = glxinfo.validate(config)
|
|
|
|
self.assertEqual(ret, (True, 'Valid beacon configuration'))
|
|
|
|
|
2016-01-06 12:55:38 +00:00
|
|
|
ret = glxinfo.beacon(config)
|
2017-06-23 17:18:49 +00:00
|
|
|
self.assertEqual(ret, [{'tag': 'screen_event',
|
|
|
|
'screen_available': False}])
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
def test_screen_state_no_repeat(self):
|
2017-06-23 17:18:49 +00:00
|
|
|
config = [{'screen_event': True, 'user': 'frank'}]
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
mock = Mock(return_value=255)
|
|
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
2017-06-23 17:18:49 +00:00
|
|
|
ret = glxinfo.validate(config)
|
|
|
|
self.assertEqual(ret, (True, 'Valid beacon configuration'))
|
|
|
|
|
2016-01-06 12:55:38 +00:00
|
|
|
ret = glxinfo.beacon(config)
|
2017-06-23 17:18:49 +00:00
|
|
|
self.assertEqual(ret, [{'tag': 'screen_event',
|
|
|
|
'screen_available': False}])
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
ret = glxinfo.beacon(config)
|
|
|
|
self.assertEqual(ret, [])
|
|
|
|
|
|
|
|
def test_screen_state_change(self):
|
2017-06-23 17:18:49 +00:00
|
|
|
config = [{'screen_event': True, 'user': 'frank'}]
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
mock = Mock(side_effect=[255, 0])
|
|
|
|
with patch.dict(glxinfo.__salt__, {'cmd.retcode': mock}):
|
2017-06-23 17:18:49 +00:00
|
|
|
ret = glxinfo.validate(config)
|
|
|
|
self.assertEqual(ret, (True, 'Valid beacon configuration'))
|
|
|
|
|
2016-01-06 12:55:38 +00:00
|
|
|
ret = glxinfo.beacon(config)
|
2017-06-23 17:18:49 +00:00
|
|
|
self.assertEqual(ret, [{'tag': 'screen_event',
|
|
|
|
'screen_available': False}])
|
2016-01-06 12:55:38 +00:00
|
|
|
|
|
|
|
ret = glxinfo.beacon(config)
|
2017-06-23 17:18:49 +00:00
|
|
|
self.assertEqual(ret, [{'tag': 'screen_event',
|
|
|
|
'screen_available': True}])
|