mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +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.
147 lines
4.1 KiB
Python
147 lines
4.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
Integration tests for Ruby Gem module
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# 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.path
|
|
|
|
# Import 3rd-party libs
|
|
from tornado.httpclient import HTTPClient
|
|
|
|
GEM = 'tidy'
|
|
GEM_VER = '1.1.2'
|
|
OLD_GEM = 'thor'
|
|
OLD_VERSION = '0.17.0'
|
|
GEM_LIST = [GEM, OLD_GEM]
|
|
|
|
|
|
def check_status():
|
|
'''
|
|
Check the status of the rubygems source
|
|
'''
|
|
try:
|
|
return HTTPClient().fetch('https://rubygems.org').code == 200
|
|
except Exception: # pylint: disable=broad-except
|
|
return False
|
|
|
|
|
|
@destructiveTest
|
|
@skipIf(not salt.utils.path.which('gem'), 'Gem is not available')
|
|
class GemModuleTest(ModuleCase):
|
|
'''
|
|
Validate gem module
|
|
'''
|
|
|
|
def setUp(self):
|
|
if check_status() is False:
|
|
self.skipTest('External resource \'https://rubygems.org\' is not available')
|
|
|
|
def test_install_uninstall(self):
|
|
'''
|
|
gem.install
|
|
gem.uninstall
|
|
'''
|
|
# Remove gem if it is already installed
|
|
if self.run_function('gem.list', [GEM]):
|
|
self.run_function('gem.uninstall', [GEM])
|
|
|
|
self.run_function('gem.install', [GEM])
|
|
gem_list = self.run_function('gem.list', [GEM])
|
|
self.assertIn(GEM, gem_list)
|
|
|
|
self.run_function('gem.uninstall', [GEM])
|
|
self.assertFalse(self.run_function('gem.list', [GEM]))
|
|
|
|
def test_install_version(self):
|
|
'''
|
|
gem.install rake version=11.1.2
|
|
'''
|
|
# Remove gem if it is already installed
|
|
if self.run_function('gem.list', [GEM]):
|
|
self.run_function('gem.uninstall', [GEM])
|
|
|
|
self.run_function('gem.install', [GEM], version=GEM_VER)
|
|
gem_list = self.run_function('gem.list', [GEM])
|
|
self.assertIn(GEM, gem_list)
|
|
self.assertIn(GEM_VER, gem_list[GEM])
|
|
|
|
self.run_function('gem.uninstall', [GEM])
|
|
self.assertFalse(self.run_function('gem.list', [GEM]))
|
|
|
|
def test_list(self):
|
|
'''
|
|
gem.list
|
|
'''
|
|
self.run_function('gem.install', [' '.join(GEM_LIST)])
|
|
|
|
all_ret = self.run_function('gem.list')
|
|
for gem in GEM_LIST:
|
|
self.assertIn(gem, all_ret)
|
|
|
|
single_ret = self.run_function('gem.list', [GEM])
|
|
self.assertIn(GEM, single_ret)
|
|
|
|
self.run_function('gem.uninstall', [' '.join(GEM_LIST)])
|
|
|
|
def test_list_upgrades(self):
|
|
'''
|
|
gem.list_upgrades
|
|
'''
|
|
# install outdated gem
|
|
self.run_function('gem.install', [OLD_GEM], version=OLD_VERSION)
|
|
|
|
ret = self.run_function('gem.list_upgrades')
|
|
self.assertIn(OLD_GEM, ret)
|
|
|
|
self.run_function('gem.uninstall', [OLD_GEM])
|
|
|
|
def test_sources_add_remove(self):
|
|
'''
|
|
gem.sources_add
|
|
gem.sources_remove
|
|
'''
|
|
source = 'http://gems.github.com'
|
|
|
|
self.run_function('gem.sources_add', [source])
|
|
sources_list = self.run_function('gem.sources_list')
|
|
self.assertIn(source, sources_list)
|
|
|
|
self.run_function('gem.sources_remove', [source])
|
|
sources_list = self.run_function('gem.sources_list')
|
|
self.assertNotIn(source, sources_list)
|
|
|
|
def test_update(self):
|
|
'''
|
|
gem.update
|
|
'''
|
|
# Remove gem if it is already installed
|
|
if self.run_function('gem.list', [OLD_GEM]):
|
|
self.run_function('gem.uninstall', [OLD_GEM])
|
|
|
|
self.run_function('gem.install', [OLD_GEM], version=OLD_VERSION)
|
|
gem_list = self.run_function('gem.list', [OLD_GEM])
|
|
self.assertEqual({'thor': ['0.17.0']}, gem_list)
|
|
|
|
self.run_function('gem.update', [OLD_GEM])
|
|
gem_list = self.run_function('gem.list', [OLD_GEM])
|
|
self.assertEqual({'thor': ['0.19.4', '0.17.0']}, gem_list)
|
|
|
|
self.run_function('gem.uninstall', [OLD_GEM])
|
|
self.assertFalse(self.run_function('gem.list', [OLD_GEM]))
|
|
|
|
def test_udpate_system(self):
|
|
'''
|
|
gem.udpate_system
|
|
'''
|
|
ret = self.run_function('gem.update_system')
|
|
self.assertTrue(ret)
|