mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +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.
136 lines
4.4 KiB
Python
136 lines
4.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Rupesh Tare <rupesht@saltstack.com>`
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.mock import (
|
|
MagicMock,
|
|
patch,
|
|
NO_MOCK,
|
|
NO_MOCK_REASON
|
|
)
|
|
|
|
# Import Salt Libs
|
|
from salt.ext import six
|
|
import salt.utils
|
|
import salt.utils.stringutils
|
|
import salt.modules.launchctl as launchctl
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class LaunchctlTestCase(TestCase, LoaderModuleMockMixin):
|
|
'''
|
|
Test cases for salt.modules.launchctl
|
|
'''
|
|
def setup_loader_modules(self):
|
|
return {launchctl: {}}
|
|
|
|
def test_get_all(self):
|
|
'''
|
|
Test for Return all installed services
|
|
'''
|
|
with patch.dict(launchctl.__salt__,
|
|
{'cmd.run': MagicMock(return_value='A\tB\tC\t\n')}):
|
|
with patch.object(launchctl,
|
|
'_available_services',
|
|
return_value={'A': 'a', 'B': 'b'}):
|
|
self.assertEqual(launchctl.get_all(), ['A', 'B', 'C'])
|
|
|
|
def test_available(self):
|
|
'''
|
|
Test for Check that the given service is available.
|
|
'''
|
|
with patch.object(launchctl,
|
|
'_service_by_name', return_value=True):
|
|
self.assertTrue(launchctl.available('job_label'))
|
|
|
|
def test_missing(self):
|
|
'''
|
|
Test for The inverse of service.available
|
|
'''
|
|
with patch.object(launchctl,
|
|
'_service_by_name', return_value=True):
|
|
self.assertFalse(launchctl.missing('job_label'))
|
|
|
|
def test_status(self):
|
|
'''
|
|
Test for Return the status for a service
|
|
'''
|
|
launchctl_data = '''<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
<plist version="1.0">
|
|
<dict>
|
|
<key>Label</key>
|
|
<string>salt-minion</string>
|
|
<key>LastExitStatus</key>
|
|
<integer>0</integer>
|
|
<key>LimitLoadToSessionType</key>
|
|
<string>System</string>
|
|
<key>OnDemand</key>
|
|
<false/>
|
|
<key>PID</key>
|
|
<integer>71</integer>
|
|
<key>ProgramArguments</key>
|
|
<array>
|
|
<string>/usr/local/bin/salt-minion</string>
|
|
</array>
|
|
<key>TimeOut</key>
|
|
<integer>30</integer>
|
|
</dict>
|
|
</plist>'''
|
|
with patch.object(launchctl,
|
|
'_service_by_name',
|
|
return_value={'plist':
|
|
{'Label': 'A'}}):
|
|
if six.PY3:
|
|
launchctl_data = salt.utils.stringutils.to_bytes(launchctl_data)
|
|
with patch.object(launchctl, '_get_launchctl_data',
|
|
return_value=launchctl_data):
|
|
self.assertTrue(launchctl.status('job_label'))
|
|
|
|
def test_stop(self):
|
|
'''
|
|
Test for Stop the specified service
|
|
'''
|
|
with patch.object(launchctl,
|
|
'_service_by_name',
|
|
return_value={'file_path': 'A'}):
|
|
with patch.dict(launchctl.__salt__,
|
|
{'cmd.retcode': MagicMock(return_value=False)}):
|
|
self.assertTrue(launchctl.stop('job_label'))
|
|
|
|
with patch.object(launchctl,
|
|
'_service_by_name',
|
|
return_value=None):
|
|
self.assertFalse(launchctl.stop('job_label'))
|
|
|
|
def test_start(self):
|
|
'''
|
|
Test for Start the specified service
|
|
'''
|
|
with patch.object(launchctl,
|
|
'_service_by_name',
|
|
return_value={'file_path': 'A'}):
|
|
with patch.dict(launchctl.__salt__,
|
|
{'cmd.retcode': MagicMock(return_value=False)}):
|
|
self.assertTrue(launchctl.start('job_label'))
|
|
|
|
with patch.object(launchctl,
|
|
'_service_by_name',
|
|
return_value=None):
|
|
self.assertFalse(launchctl.start('job_label'))
|
|
|
|
def test_restart(self):
|
|
'''
|
|
Test for Restart the named service
|
|
'''
|
|
with patch.object(launchctl, 'stop', return_value=None):
|
|
with patch.object(launchctl, 'start', return_value=True):
|
|
self.assertTrue(launchctl.restart('job_label'))
|