mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +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.
143 lines
4.6 KiB
Python
143 lines
4.6 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.modules.cassandra as cassandra
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class CassandraTestCase(TestCase, LoaderModuleMockMixin):
|
|
'''
|
|
Test cases for salt.modules.cassandra
|
|
'''
|
|
def setup_loader_modules(self):
|
|
return {cassandra: {}}
|
|
|
|
def test_compactionstats(self):
|
|
'''
|
|
Test for Return compactionstats info
|
|
'''
|
|
mock = MagicMock(return_value='A')
|
|
with patch.object(cassandra, '_nodetool', mock):
|
|
self.assertEqual(cassandra.compactionstats(), 'A')
|
|
|
|
def test_version(self):
|
|
'''
|
|
Test for Return the cassandra version
|
|
'''
|
|
mock = MagicMock(return_value='A')
|
|
with patch.object(cassandra, '_nodetool', mock):
|
|
self.assertEqual(cassandra.version(), 'A')
|
|
|
|
def test_netstats(self):
|
|
'''
|
|
Test for Return netstats info
|
|
'''
|
|
mock = MagicMock(return_value='A')
|
|
with patch.object(cassandra, '_nodetool', mock):
|
|
self.assertEqual(cassandra.netstats(), 'A')
|
|
|
|
def test_tpstats(self):
|
|
'''
|
|
Test for Return tpstats info
|
|
'''
|
|
mock = MagicMock(return_value='A')
|
|
with patch.object(cassandra, '_nodetool', mock):
|
|
self.assertEqual(cassandra.tpstats(), 'A')
|
|
|
|
def test_info(self):
|
|
'''
|
|
Test for Return cassandra node info
|
|
'''
|
|
mock = MagicMock(return_value='A')
|
|
with patch.object(cassandra, '_nodetool', mock):
|
|
self.assertEqual(cassandra.info(), 'A')
|
|
|
|
def test_ring(self):
|
|
'''
|
|
Test for Return ring info
|
|
'''
|
|
mock = MagicMock(return_value='A')
|
|
with patch.object(cassandra, '_nodetool', mock):
|
|
self.assertEqual(cassandra.ring(), 'A')
|
|
|
|
def test_keyspaces(self):
|
|
'''
|
|
Test for Return existing keyspaces
|
|
'''
|
|
mock_keyspaces = ['A', 'B', 'C', 'D']
|
|
|
|
class MockSystemManager(object):
|
|
def list_keyspaces(self):
|
|
return mock_keyspaces
|
|
|
|
mock_sys_mgr = MagicMock(return_value=MockSystemManager())
|
|
|
|
with patch.object(cassandra, '_sys_mgr', mock_sys_mgr):
|
|
self.assertEqual(cassandra.keyspaces(), mock_keyspaces)
|
|
|
|
def test_column_families(self):
|
|
'''
|
|
Test for Return existing column families for all keyspaces
|
|
'''
|
|
mock_keyspaces = ['A', 'B']
|
|
|
|
class MockSystemManager(object):
|
|
def list_keyspaces(self):
|
|
return mock_keyspaces
|
|
|
|
def get_keyspace_column_families(self, keyspace):
|
|
if keyspace == 'A':
|
|
return {'a': 'saltines', 'b': 'biscuits'}
|
|
if keyspace == 'B':
|
|
return {'c': 'cheese', 'd': 'crackers'}
|
|
|
|
mock_sys_mgr = MagicMock(return_value=MockSystemManager())
|
|
|
|
with patch.object(cassandra, '_sys_mgr', mock_sys_mgr):
|
|
self.assertEqual(cassandra.column_families('Z'),
|
|
None)
|
|
if six.PY3:
|
|
self.assertCountEqual(cassandra.column_families('A'),
|
|
['a', 'b'])
|
|
self.assertCountEqual(cassandra.column_families(),
|
|
{'A': ['a', 'b'], 'B': ['c', 'd']})
|
|
else:
|
|
self.assertEqual(cassandra.column_families('A'),
|
|
['a', 'b'])
|
|
self.assertEqual(cassandra.column_families(),
|
|
{'A': ['a', 'b'], 'B': ['c', 'd']})
|
|
|
|
def test_column_family_definition(self):
|
|
'''
|
|
Test for Return a dictionary of column family definitions for the given
|
|
keyspace/column_family
|
|
'''
|
|
class MockSystemManager(object):
|
|
def get_keyspace_column_families(self, keyspace):
|
|
if keyspace == 'A':
|
|
return {'a': object, 'b': object}
|
|
if keyspace == 'B':
|
|
raise Exception
|
|
|
|
mock_sys_mgr = MagicMock(return_value=MockSystemManager())
|
|
|
|
with patch.object(cassandra, '_sys_mgr', mock_sys_mgr):
|
|
self.assertEqual(cassandra.column_family_definition('A', 'a'), vars(object))
|
|
self.assertEqual(cassandra.column_family_definition('B', 'a'), None)
|