Jonathan Ballet
4ff9f4be2a
Fix file.directory with clean=true and require_in with states ID
...
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.
Fix #8646
2015-10-07 14:53:04 +02:00
Jonathan Ballet
0d391275de
Test cases to demonstrate bug #8646
2015-10-07 12:06:35 +02:00
Erik Johnson
37c8852584
Update git.config_set tests to use new state name
2015-09-02 20:58:06 -05:00
Andreas Lutro
2f55d60293
git.latest: add test for no rev
...
technically, rename existing test and add a new simpler test with the
old name.
2015-08-18 16:38:24 +02:00
Mike Place
35d6ae2be7
Use with
2015-08-12 12:14:12 -06:00
Andreas Lutro
ceda2b7274
users: integration test for empty GECOS fields
2015-08-07 09:25:21 +02:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Jason Hamner
24f653e963
Integration Test for Issue 25250
...
Adds integration test for #25250
2015-07-24 13:28:15 -06:00
Colton Myers
76e468bc20
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/cloud/clouds/vmware.py
salt/daemons/flo/core.py
salt/modules/hipchat.py
salt/modules/lxc.py
salt/modules/rabbitmq.py
salt/pillar/s3.py
salt/states/dockerio.py
salt/states/file.py
salt/utils/process.py
salt/utils/s3.py
2015-07-20 13:55:14 -06:00
Pedro Algarvio
c4b15840c6
Additional test case for question raised in #1846
...
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
2015-07-15 14:29:43 +01:00
Colton Myers
24d51fb8f1
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/configuration/minion.rst
salt/config.py
salt/modules/sudo.py
tests/integration/states/file.py
2015-07-02 09:46:36 -06:00
Justin Findlay
6f238e924c
integration test file.managed sources
2015-06-30 14:26:59 -06:00
Doug Luce
6fe47ea1f4
Allow URL specification of NPM packages
...
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError. Assume that not every package installed globally is
specified with a URL.
Example failing state:
kvsio:
npm.installed:
- name: git+ssh://github.com/dougluce/kvs.io.git
2015-05-26 13:19:17 -07:00
Justin Findlay
f58f3dac1d
integration test for char escaping in file paths
2015-05-04 23:24:45 -06:00
Colton Myers
313c46501d
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/auth/pam.py
salt/modules/boto_route53.py
salt/state.py
2015-04-24 10:19:03 -06:00
Colton Myers
63119f9505
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/dockerio.py
salt/modules/localemod.py
salt/modules/useradd.py
2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8
Merge pull request #22946 from s0undt3ch/2014.7
...
Test with a more recent pip version to avoid a traceback
2015-04-22 10:25:17 -06:00
Pedro Algarvio
bc87749e2c
Test with a more recent pip version to avoid a traceback
...
```
07:39:05,449 [salt.minion :1178][ERROR ] A command in 'pip.list' had a problem: Traceback (most recent call last):
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
return get_distribution(dist).load_entry_point(group, name)
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
return ep.load()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
return self.resolve()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
module = __import__(self.module_name, fromlist=['__name__'], level=0)
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
from pip.commands import commands, get_similar_commands, get_summaries
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
from pip.commands.bundle import BundleCommand
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
from pip.commands.install import InstallCommand
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
from pip.req import InstallRequirement, RequirementSet, parse_requirements
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
from .req_install import InstallRequirement
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
import pip.wheel
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
2015-04-22 16:13:58 +01:00
Viet Hung Nguyen
b13db32fde
add test for #18843
2015-04-22 16:21:23 +07:00
rallytime
1e4b93dec9
Python 3 compat fixes for develop
2015-04-17 12:00:01 -06:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thomas S Hatch
586b81b33e
Add tests for the jinja demands
2015-04-15 16:39:08 -06:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Justin Findlay
56364ff571
adding cmd.run state integration tests
2015-04-06 20:32:22 -06:00
Pedro Algarvio
ff4aa5b989
Include unless in the state internal keywords.
...
Fixes #22359
2015-04-05 01:00:08 +01:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Colton Myers
8c1fa5358e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/debian_ip.py
salt/modules/file.py
salt/states/ssh_auth.py
salt/utils/cloud.py
2015-03-09 11:50:21 -06:00
Viet Hung Nguyen
2a845989b7
bugfix: fix test mode in ssh_known_hosts
...
- present func: should not require key/fingerprint.
In normal mode, key AND fingerprint can be omitted but
test mode requires them, so fix the test mode to behave same
way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
2015-03-07 00:58:32 +07:00
Alexander Pyatkin
5edb6cba11
Implement Bower state module
2015-02-21 05:57:54 +00:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
Pedro Algarvio
ff636249f4
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf
Py3 compatibility
2015-01-30 22:27:05 +00:00
Pedro Algarvio
79be964dc2
We need to write something, even an empty string
2015-01-30 22:25:19 +00:00
Pedro Algarvio
b791dd6971
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
fdc467b587
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Mike Place
09d3d62174
Loosen test constraint and update runas arg
2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5
Even MORE test fixing
2015-01-24 03:16:50 +00:00
Mike Place
7222d741de
Even more pip test fixing
2015-01-24 03:16:50 +00:00
rallytime
69d7a6ebd0
Pylint fixes for the 2015.2 branch
2015-01-23 10:57:18 -07:00
Mathias Gug
4670988a68
Fix style.
2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3
Fix style.
2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d
Fix style issues.
2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e
Add boto_sns module and state.
...
Include integration tests.
2015-01-22 14:40:32 -07:00
Mathias Gug
f4c75375f4
Make sure boto_sns state is idempotent.
2015-01-22 12:13:33 -08:00
Mathias Gug
85ec021a73
Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions
...
Conflicts:
tests/integration/states/boto_sns.py
2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5
Support subscriptions in sns topic state.
2015-01-22 11:04:31 -08:00
Pedro Algarvio
8dbb7394b2
White-space lint fix
2015-01-21 14:17:03 +00:00
Thomas S Hatch
fab600add9
Merge pull request #19746 from lyft/add-boto-sns-module
...
Add boto_sns module and state.
2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 13:35:47 -08:00
Mathias Gug
64cf74ebaa
Fix style.
2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e
Fix style.
2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd
Fix style issues.
2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6
Add boto_sns module and state.
...
Include integration tests.
2015-01-14 15:43:06 -08:00
Mike Place
fc9a647a3b
Remove assert:
2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597
Fix tests
2015-01-12 16:01:10 -07:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
rallytime
d6b3f69c19
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 13:10:09 -07:00
rallytime
28cb062697
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 10:52:55 -07:00
Mike Place
ca9a871d43
Merge pull request #19536 from rallytime/pip_test_fix
...
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744
Keep package name the same
2015-01-08 12:13:26 -07:00
rallytime
a0f801f475
Skip this test when we are running on centOS 5
2015-01-08 12:11:51 -07:00
rallytime
5490530504
Change the install package to fix pip tests
2015-01-08 09:32:53 -07:00
rallytime
4e87557748
--local is not available in older versions of git
...
Also adjust the tests:
subprocess.check_output is only available in python 2.7
2015-01-07 11:56:43 -07:00
rallytime
fe4fd7a5a3
Use skip_if_binaries_missing decorator
2015-01-07 10:11:26 -07:00
Colton Myers
f6eae029f0
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/grains/core.py
salt/minion.py
salt/modules/mongodb.py
salt/states/archive.py
salt/states/mount.py
salt/utils/master.py
salt/utils/schedule.py
salt/utils/thin.py
tests/jenkins-ng.py
2015-01-06 13:14:27 -07:00
rallytime
f6243f0b80
Fix the test in the correct place...
2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860
Fix pip state test failure
2015-01-05 15:20:18 -07:00
Mike Place
7ff6c22b9b
Remove deprecated tests
2014-12-19 11:37:56 -07:00
Colton Myers
43df12b6cc
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/client/ssh/shell.py
salt/modules/file.py
tests/integration/states/file.py
2014-12-18 10:32:19 -07:00
Elias Probst
a2e52dd5fc
Fix tests for #18841 .
2014-12-18 01:51:08 +01:00
Elias Probst
6363aa22ac
Add integration tests for 'modules.file.replace()'.
2014-12-17 12:06:58 +01:00
Pedro Algarvio
bfe99dbb3f
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runners/lxc.py
salt/runners/manage.py
2014-11-26 20:14:56 +00:00
Pedro Algarvio
89befb8827
Switch open() for salt.utils.fopen()
2014-11-26 18:02:24 +00:00
Pedro Algarvio
b5cda75a8c
Switch open() for salt.utils.fopen()
2014-11-26 18:01:35 +00:00
Pedro Algarvio
ea717d2422
Switch open() for salt.utils.fopen()
2014-11-26 17:59:52 +00:00
Thomas S Hatch
873d1c1803
Merge pull request #18221 from multani/fix/git-config-set-shell-escape
...
Fix Git's config set with values containing white spaces.
2014-11-18 17:14:43 -07:00
Jonathan Ballet
38bb70d398
Fix Git's config set with values containing white spaces.
...
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:
mylocalrepo:
git.config:
- name: user.name
- value: "Jonathan Ballet"
- repo: file://my/path/to/repo
This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)
This commit fixes the problem and adds some unit tests to verify it's
working properly.
2014-11-18 20:02:24 +01:00
Mike Place
c1c9245e89
Fixup test failures
2014-10-28 11:29:59 -06:00
Mike Place
e18190bc04
remove sed test
2014-10-27 18:22:18 -06:00
Erik Johnson
ff6a228746
Remove reference to nonexistant function in pkg tests
...
This fixes a ref that was missed in 7984a8c
2014-08-27 13:52:36 -05:00
Seth House
11f4e20bd8
Fix incorrect call to state.single in npm pkgs test
2014-08-11 11:03:00 -04:00
Seth House
ed4bb5119e
Added pkgs support to the npm module/state
2014-08-07 12:36:39 -04:00
rallytime
6be33dcdc9
Change install package to help Arch tests pass
2014-08-05 14:35:32 -06:00
C. R. Oldham
253de7a995
PyLint fix.
2014-07-25 12:48:07 -06:00
C. R. Oldham
f53e477735
Merge commit, resolve conflict
2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d
Extend dot-in-pkg test to RHEL 5 as well
2014-07-25 10:57:18 -06:00
Thomas S Hatch
288e9bba29
TABS?!?!? Really @cro ??
2014-07-25 10:39:19 -06:00
C. R. Oldham
b6f70ac80f
Make this test check for diff packages on RHEL/Centos 6 vs 7
2014-07-24 19:09:52 -04:00
Erik Johnson
2939eaec15
Clean up filehandle usage in file state tests
...
This does a few things:
1. Change calls to open() to use salt.utils.fopen()
2. Use with blocks where applicable
2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2
Add tests for templating local files
2014-07-14 21:23:06 -05:00
Mike Place
a08849c270
Remove old-style env= tests.
2014-07-14 11:03:03 -06:00
Pedro Algarvio
5283fa661e
Adapt tests to behaviour introduced in #13333
2014-06-10 03:00:19 +01:00
Pedro Algarvio
0b6776ad81
Maintain old test behaviour(no new lines added)
2014-06-10 02:32:22 +01:00
Pedro Algarvio
df3e06ddd7
Test needs root perms
2014-06-10 01:56:24 +01:00
