mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
ba63920874
Some states are complicated and multiple subparts, or maybe cross-call into __states__ if they manage subresources. In these cases, they will have multiple comments. Make this more ergonomic by supporting a list of strings as the value for ret['comment'] in state returns and documenting this. By joining comments on newlines, it is possible to combine single-line and multi-line comments cleanly, as opposed to e.g. commas. The driving impetus for this is some of the boto modules. An update to the boto_sqs module is included as an example. Add a check that outgoing state return data has the right shape, and add a testcase as well. Fix the NPM state tests and the saltmod runner & wheel state functions to comply with the prescribed format.
69 lines
2.3 KiB
Python
69 lines
2.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Erik Johnson (erik@saltstack.com)`
|
|
tests.integration.states.npm
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
'''
|
|
# 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, requires_network
|
|
from tests.support.mixins import SaltReturnAssertsMixin
|
|
|
|
# Import salt libs
|
|
import salt.modules.cmdmod as cmd
|
|
import salt.utils.path
|
|
from salt.utils.versions import LooseVersion
|
|
|
|
MAX_NPM_VERSION = '5.0.0'
|
|
|
|
|
|
@skipIf(salt.utils.path.which('npm') is None, 'npm not installed')
|
|
class NpmStateTest(ModuleCase, SaltReturnAssertsMixin):
|
|
|
|
@requires_network()
|
|
@destructiveTest
|
|
def test_npm_installed_removed(self):
|
|
'''
|
|
Basic test to determine if NPM module was successfully installed and
|
|
removed.
|
|
'''
|
|
ret = self.run_state('npm.installed', name='pm2')
|
|
self.assertSaltTrueReturn(ret)
|
|
ret = self.run_state('npm.removed', name='pm2')
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
@requires_network()
|
|
@destructiveTest
|
|
def test_npm_install_url_referenced_package(self):
|
|
'''
|
|
Determine if URL-referenced NPM module can be successfully installed.
|
|
'''
|
|
ret = self.run_state('npm.installed', name='request/request#v2.81.1')
|
|
self.assertSaltTrueReturn(ret)
|
|
ret = self.run_state('npm.removed', name='git://github.com/request/request')
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
@requires_network()
|
|
@destructiveTest
|
|
def test_npm_installed_pkgs(self):
|
|
'''
|
|
Basic test to determine if NPM module successfully installs multiple
|
|
packages.
|
|
'''
|
|
ret = self.run_state('npm.installed', name='unused', pkgs=['pm2', 'grunt'])
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
@skipIf(salt.utils.path.which('npm') and LooseVersion(cmd.run('npm -v')) >= LooseVersion(MAX_NPM_VERSION),
|
|
'Skip with npm >= 5.0.0 until #41770 is fixed')
|
|
@destructiveTest
|
|
def test_npm_cache_clean(self):
|
|
'''
|
|
Basic test to determine if NPM successfully cleans its cached packages.
|
|
'''
|
|
ret = self.run_state('npm.cache_cleaned', name='unused', force=True)
|
|
self.assertSaltTrueReturn(ret)
|