2016-06-01 21:09:55 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
2016-06-02 15:03:10 +00:00
|
|
|
'''
|
|
|
|
Integration tests for Ruby Gem module
|
|
|
|
'''
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
# Import Python libs
|
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
|
|
# Import Salt Testing libs
|
2017-04-03 16:04:09 +00:00
|
|
|
from tests.support.case import ModuleCase
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import skipIf
|
2017-02-27 15:59:04 +00:00
|
|
|
from tests.support.helpers import destructiveTest
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
# Import salt libs
|
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
|
|
|
import salt.utils.path
|
2017-04-18 11:26:06 +00:00
|
|
|
|
|
|
|
# Import 3rd-party libs
|
|
|
|
from tornado.httpclient import HTTPClient
|
2016-06-01 21:09:55 +00:00
|
|
|
|
2016-06-15 19:41:00 +00:00
|
|
|
GEM = 'tidy'
|
|
|
|
GEM_VER = '1.1.2'
|
2017-08-17 19:45:10 +00:00
|
|
|
OLD_GEM = 'brass'
|
|
|
|
OLD_VERSION = '1.0.0'
|
|
|
|
NEW_VERSION = '1.2.1'
|
2016-06-15 19:41:00 +00:00
|
|
|
GEM_LIST = [GEM, OLD_GEM]
|
2016-06-03 14:54:51 +00:00
|
|
|
|
2016-06-03 10:28:42 +00:00
|
|
|
|
2016-06-02 20:32:08 +00:00
|
|
|
def check_status():
|
|
|
|
'''
|
|
|
|
Check the status of the rubygems source
|
|
|
|
'''
|
2016-09-07 05:32:47 +00:00
|
|
|
try:
|
2017-04-18 11:26:06 +00:00
|
|
|
return HTTPClient().fetch('https://rubygems.org').code == 200
|
|
|
|
except Exception: # pylint: disable=broad-except
|
2016-09-07 05:32:47 +00:00
|
|
|
return False
|
2016-06-02 20:32:08 +00:00
|
|
|
|
2016-06-01 21:09:55 +00:00
|
|
|
|
2016-06-01 21:25:18 +00:00
|
|
|
@destructiveTest
|
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
|
|
|
@skipIf(not salt.utils.path.which('gem'), 'Gem is not available')
|
2017-04-03 16:04:09 +00:00
|
|
|
class GemModuleTest(ModuleCase):
|
2016-06-01 21:09:55 +00:00
|
|
|
'''
|
|
|
|
Validate gem module
|
|
|
|
'''
|
|
|
|
|
2017-04-17 07:49:59 +00:00
|
|
|
def setUp(self):
|
|
|
|
if check_status() is False:
|
2017-04-18 11:26:06 +00:00
|
|
|
self.skipTest('External resource \'https://rubygems.org\' is not available')
|
2017-04-17 07:49:59 +00:00
|
|
|
|
2016-06-01 21:09:55 +00:00
|
|
|
def test_install_uninstall(self):
|
|
|
|
'''
|
|
|
|
gem.install
|
|
|
|
gem.uninstall
|
|
|
|
'''
|
2016-06-06 23:32:17 +00:00
|
|
|
# Remove gem if it is already installed
|
|
|
|
if self.run_function('gem.list', [GEM]):
|
|
|
|
self.run_function('gem.uninstall', [GEM])
|
2016-06-01 21:09:55 +00:00
|
|
|
|
2016-06-01 22:57:37 +00:00
|
|
|
self.run_function('gem.install', [GEM])
|
|
|
|
gem_list = self.run_function('gem.list', [GEM])
|
2016-06-06 23:33:42 +00:00
|
|
|
self.assertIn(GEM, gem_list)
|
2016-06-01 22:57:37 +00:00
|
|
|
|
|
|
|
self.run_function('gem.uninstall', [GEM])
|
|
|
|
self.assertFalse(self.run_function('gem.list', [GEM]))
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
def test_install_version(self):
|
|
|
|
'''
|
|
|
|
gem.install rake version=11.1.2
|
|
|
|
'''
|
2016-06-06 23:32:17 +00:00
|
|
|
# Remove gem if it is already installed
|
|
|
|
if self.run_function('gem.list', [GEM]):
|
|
|
|
self.run_function('gem.uninstall', [GEM])
|
2016-06-01 22:57:37 +00:00
|
|
|
|
|
|
|
self.run_function('gem.install', [GEM], version=GEM_VER)
|
|
|
|
gem_list = self.run_function('gem.list', [GEM])
|
2016-06-06 23:33:42 +00:00
|
|
|
self.assertIn(GEM, gem_list)
|
|
|
|
self.assertIn(GEM_VER, gem_list[GEM])
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
self.run_function('gem.uninstall', [GEM])
|
2016-06-01 22:57:37 +00:00
|
|
|
self.assertFalse(self.run_function('gem.list', [GEM]))
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
def test_list(self):
|
|
|
|
'''
|
|
|
|
gem.list
|
|
|
|
'''
|
2016-06-15 19:41:00 +00:00
|
|
|
self.run_function('gem.install', [' '.join(GEM_LIST)])
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
all_ret = self.run_function('gem.list')
|
2016-06-15 19:41:00 +00:00
|
|
|
for gem in GEM_LIST:
|
|
|
|
self.assertIn(gem, all_ret)
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
single_ret = self.run_function('gem.list', [GEM])
|
2016-06-06 23:33:42 +00:00
|
|
|
self.assertIn(GEM, single_ret)
|
2016-06-01 21:09:55 +00:00
|
|
|
|
2016-06-15 19:41:00 +00:00
|
|
|
self.run_function('gem.uninstall', [' '.join(GEM_LIST)])
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
def test_list_upgrades(self):
|
|
|
|
'''
|
|
|
|
gem.list_upgrades
|
|
|
|
'''
|
|
|
|
# install outdated gem
|
2016-06-02 15:03:10 +00:00
|
|
|
self.run_function('gem.install', [OLD_GEM], version=OLD_VERSION)
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
ret = self.run_function('gem.list_upgrades')
|
2016-06-01 21:25:18 +00:00
|
|
|
self.assertIn(OLD_GEM, ret)
|
2016-06-01 21:09:55 +00:00
|
|
|
|
2016-06-01 21:16:15 +00:00
|
|
|
self.run_function('gem.uninstall', [OLD_GEM])
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
def test_sources_add_remove(self):
|
|
|
|
'''
|
|
|
|
gem.sources_add
|
|
|
|
gem.sources_remove
|
|
|
|
'''
|
|
|
|
source = 'http://gems.github.com'
|
|
|
|
|
2016-06-01 22:57:37 +00:00
|
|
|
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)
|
2016-06-01 21:09:55 +00:00
|
|
|
|
|
|
|
def test_update(self):
|
|
|
|
'''
|
|
|
|
gem.update
|
|
|
|
'''
|
2016-06-06 23:32:17 +00:00
|
|
|
# Remove gem if it is already installed
|
|
|
|
if self.run_function('gem.list', [OLD_GEM]):
|
|
|
|
self.run_function('gem.uninstall', [OLD_GEM])
|
2016-06-01 22:57:37 +00:00
|
|
|
|
2016-06-01 21:09:55 +00:00
|
|
|
self.run_function('gem.install', [OLD_GEM], version=OLD_VERSION)
|
2016-06-01 22:57:37 +00:00
|
|
|
gem_list = self.run_function('gem.list', [OLD_GEM])
|
2017-08-17 16:38:32 +00:00
|
|
|
self.assertEqual({OLD_GEM: [OLD_VERSION]}, gem_list)
|
2016-06-01 22:57:37 +00:00
|
|
|
|
2016-06-02 15:03:10 +00:00
|
|
|
self.run_function('gem.update', [OLD_GEM])
|
2016-06-01 22:57:37 +00:00
|
|
|
gem_list = self.run_function('gem.list', [OLD_GEM])
|
2017-08-17 16:38:32 +00:00
|
|
|
self.assertEqual({OLD_GEM: [NEW_VERSION, OLD_VERSION]}, gem_list)
|
2016-06-01 22:57:37 +00:00
|
|
|
|
2016-06-02 15:03:10 +00:00
|
|
|
self.run_function('gem.uninstall', [OLD_GEM])
|
2016-06-01 22:57:37 +00:00
|
|
|
self.assertFalse(self.run_function('gem.list', [OLD_GEM]))
|
2016-06-01 21:09:55 +00:00
|
|
|
|
2017-08-17 16:38:32 +00:00
|
|
|
def test_update_system(self):
|
2016-06-01 21:09:55 +00:00
|
|
|
'''
|
2017-08-17 16:38:32 +00:00
|
|
|
gem.update_system
|
2016-06-01 21:09:55 +00:00
|
|
|
'''
|
|
|
|
ret = self.run_function('gem.update_system')
|
|
|
|
self.assertTrue(ret)
|