mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +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.
88 lines
2.8 KiB
Python
88 lines
2.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
import shutil
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import destructiveTest
|
|
|
|
# Import Salt libs
|
|
import salt.utils.platform
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
@destructiveTest
|
|
@skipIf(salt.utils.platform.is_windows(), 'No mtab on Windows')
|
|
@skipIf(salt.utils.platform.is_darwin(), 'No mtab on Darwin')
|
|
class DiskModuleVirtualizationTest(ModuleCase):
|
|
'''
|
|
Test to make sure we return a clean result under Docker. Refs #8976
|
|
|
|
This is factored into its own class so that we can have some certainty that setUp() and tearDown() are run.
|
|
'''
|
|
def setUp(self):
|
|
# Make /etc/mtab unreadable
|
|
if os.path.isfile('/etc/mtab'):
|
|
shutil.move('/etc/mtab', '/tmp/mtab')
|
|
|
|
def test_no_mtab(self):
|
|
ret = self.run_function('disk.usage')
|
|
self.assertDictEqual(ret, {})
|
|
|
|
def tearDown(self):
|
|
if os.path.isfile('/tmp/mtab'):
|
|
shutil.move('/tmp/mtab', '/etc/mtab')
|
|
|
|
|
|
class DiskModuleTest(ModuleCase):
|
|
'''
|
|
Validate the disk module
|
|
'''
|
|
def test_usage(self):
|
|
'''
|
|
disk.usage
|
|
'''
|
|
ret = self.run_function('disk.usage')
|
|
self.assertTrue(isinstance(ret, dict))
|
|
if not isinstance(ret, dict):
|
|
return
|
|
if salt.utils.platform.is_darwin():
|
|
for key, val in six.iteritems(ret):
|
|
self.assertTrue('filesystem' in val)
|
|
self.assertTrue('512-blocks' in val)
|
|
self.assertTrue('used' in val)
|
|
self.assertTrue('available' in val)
|
|
self.assertTrue('capacity' in val)
|
|
self.assertTrue('iused' in val)
|
|
self.assertTrue('ifree' in val)
|
|
self.assertTrue('%iused' in val)
|
|
else:
|
|
for key, val in six.iteritems(ret):
|
|
self.assertTrue('filesystem' in val)
|
|
self.assertTrue('1K-blocks' in val)
|
|
self.assertTrue('used' in val)
|
|
self.assertTrue('available' in val)
|
|
self.assertTrue('capacity' in val)
|
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'inode info not available on Windows')
|
|
def test_inodeusage(self):
|
|
'''
|
|
disk.inodeusage
|
|
'''
|
|
ret = self.run_function('disk.inodeusage')
|
|
self.assertTrue(isinstance(ret, dict))
|
|
if not isinstance(ret, dict):
|
|
return
|
|
for key, val in six.iteritems(ret):
|
|
self.assertTrue('inodes' in val)
|
|
self.assertTrue('used' in val)
|
|
self.assertTrue('free' in val)
|
|
self.assertTrue('use' in val)
|
|
self.assertTrue('filesystem' in val)
|