saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14895 from whiteinge/npm-cleanup

Browse source 
Fix npm test; npm state pylint fix
This commit is contained in:
Thomas S Hatch 2014-08-12 11:44:42 -06:00
commit 1a5c0c5dca
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/states/npm.py
View file

@ -132,8 +132,7 @@ def installed(name,
if prefix.lower() in installed_pkgs:
if force_reinstall is False:
pkgs_satisfied.append('{1}@{2}'.format(
pkg_name,
pkgs_satisfied.append('{0}@{1}'.format(
prefix,
installed_pkgs[prefix.lower()]['version']))
else:

2
tests/integration/states/npm.py
View file

@ -35,7 +35,7 @@ class NpmStateTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
Basic test to determine if NPM module successfully installs multiple
packages.
'''
ret = self.run_state('npm.installed', pkgs=['pm2', 'grunt'])
ret = self.run_state('npm.installed', name=None, pkgs=['pm2', 'grunt'])
self.assertSaltTrueReturn(ret)